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)
commita8c079b27deff1d71e009fb06ef9d93b18e2c028
treea6755739a1254d50733a646ad4dfc421ddf76528
parent9f38982dc73f1295657b58a3899436802c6ccfa3
parent0a4cb75024898f4386c2c9fd6faa16ef7aef7d0b
Merge pull request #5256 from totten/master-composer-lock

composer.lock - Re-add to git