Merge pull request #5256 from totten/master-composer-lock
authorTim Otten <totten@civicrm.org>
Thu, 26 Feb 2015 01:07:42 +0000 (17:07 -0800)
committerTim Otten <totten@civicrm.org>
Thu, 26 Feb 2015 01:07:42 +0000 (17:07 -0800)
composer.lock - Re-add to git


Trivial merge