Merge pull request #114 from peterkokot/master
authorRob Allen <rob@akrabat.com>
Sun, 2 Sep 2012 11:01:22 +0000 (04:01 -0700)
committerRob Allen <rob@akrabat.com>
Sun, 2 Sep 2012 11:01:22 +0000 (04:01 -0700)
composer.phar updated


Trivial merge