Merge pull request #6768 from totten/master-composer-lock
authorTim Otten <totten@civicrm.org>
Fri, 18 Sep 2015 19:51:47 +0000 (12:51 -0700)
committerTim Otten <totten@civicrm.org>
Fri, 18 Sep 2015 19:51:47 +0000 (12:51 -0700)
composer.lock - update


Trivial merge