Revision f387cf1e8fa1fbc017e9cdf8ca0a604d761a63c5

Committed on 02/10/2013 5:57 am by Edi Modrić <edi@netgen.hr> [GitHub Diff]

Merge branch 'master' into github_master

Conflicts:
composer.json