Merge https://github.com/civicrm/civicrm-core/pull/6276
authorColeman Watts <coleman@civicrm.org>
Mon, 10 Aug 2015 17:07:43 +0000 (13:07 -0400)
committerColeman Watts <coleman@civicrm.org>
Mon, 10 Aug 2015 17:07:43 +0000 (13:07 -0400)
commit3d16e5e83065629c1811d4a6a92c3cda88cdccd4
tree43b2149b929a72cb314139e7e214595177b87141
parent7a97408abd82f7825da36475395af29080bb0718
parentd47a6f4a1fc39ec5720cdc87832e7154aac32273
Merge https://github.com/civicrm/civicrm-core/pull/6276

Conflicts:
CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
CRM/Utils/System.php
css/civicrm.css
tests/phpunit/api/v3/SyntaxConformanceTest.php