Merge pull request #4829 from totten/master-composer
authorTim Otten <totten@civicrm.org>
Mon, 5 Jan 2015 23:50:21 +0000 (15:50 -0800)
committerTim Otten <totten@civicrm.org>
Mon, 5 Jan 2015 23:50:21 +0000 (15:50 -0800)
composer - Move composer.json into civicrm-core.git


Trivial merge