Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11164] Update composer.phar
This commit is contained in:
Andreas Fischer 2012-11-05 15:18:15 -05:00
commit 44ff9d020f

Binary file not shown.