OSDN Git Service

Merge branch 'master' into package-manager-v2 package-manager-v2
authorscribu <mail@scribu.net>
Mon, 12 Aug 2013 20:53:41 +0000 (23:53 +0300)
committerscribu <mail@scribu.net>
Mon, 12 Aug 2013 20:53:41 +0000 (23:53 +0300)
Doesn't need PHPUnit and Behat installed as packages

1  2 
composer.json

diff --cc composer.json
Simple merge