Revision 537db628328dad3b0d18e9b9bd630e2fa1fb0506

Committed on 04/11/2013 7:45 am by Edi Modrić <edi.modric@gmail.com> [GitHub Diff]

Merge branch 'master' into github_master

Conflicts:
composer.json