Merge branch 'onlyjob-master'
authorTim Otten <totten@civicrm.org>
Thu, 2 Jul 2015 22:22:45 +0000 (15:22 -0700)
committerTim Otten <totten@civicrm.org>
Thu, 2 Jul 2015 22:22:45 +0000 (15:22 -0700)
commitc7956780e95aec6abcb7b73b6cf5d7b30b2d49ff
tree1b0e47a1abf4925a59cd314755c1d046b0a7380b
parent84b14119f370fe82bb6027f6b2854660b636c03a
parente64b82c93236ca51f49ba2c0c1af156771c8aa13
Merge branch 'onlyjob-master'

Conflicts:
composer.json
composer.json