From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Sep 2015 19:51:47 +0000 (-0700)
Subject: Merge pull request #6768 from totten/master-composer-lock
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5aec1a43ca3d0e41a93d2ee4be1f7a1daac2f31a;p=civicrm-core.git

Merge pull request #6768 from totten/master-composer-lock

composer.lock - update
---

5aec1a43ca3d0e41a93d2ee4be1f7a1daac2f31a