From: Tim Otten <totten@civicrm.org>
Date: Mon, 5 Jan 2015 23:50:21 +0000 (-0800)
Subject: Merge pull request #4829 from totten/master-composer
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9fab7c013cc2bc4908e3a77df8994c465a1ddbe1;p=civicrm-core.git

Merge pull request #4829 from totten/master-composer

composer - Move composer.json into civicrm-core.git
---

9fab7c013cc2bc4908e3a77df8994c465a1ddbe1