From: Tim Otten <totten@civicrm.org>
Date: Thu, 2 Jul 2015 22:22:45 +0000 (-0700)
Subject: Merge branch 'onlyjob-master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c7956780e95aec6abcb7b73b6cf5d7b30b2d49ff;p=civicrm-core.git

Merge branch 'onlyjob-master'

Conflicts:
	composer.json
---

c7956780e95aec6abcb7b73b6cf5d7b30b2d49ff
diff --cc composer.json
index 4a3e49b29e,98f8366e3d..0b54273098
--- a/composer.json
+++ b/composer.json
@@@ -9,8 -9,7 +9,8 @@@
      "dompdf/dompdf" : "0.6.*",
      "symfony/dependency-injection": "2.3.*",
      "symfony/event-dispatcher": "2.3.*",
 +    "symfony/process": "2.3.*",
-     "psr/log": "1.0.0",
+     "psr/log": "~1.0.0",
      "symfony/finder": "2.3.*",
      "totten/ca-config": "~13.02"
    },