Merge branch 'master' into atif-shaikh-CRM-15979
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 22:55:26 +0000 (14:55 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 22:55:26 +0000 (14:55 -0800)
commit73f73e4d0a0fc5eff99c51ab10a2b15241b1be23
tree5fc8f31cd586534201b59db7edff2d9e7252254c
parentf72b68c00202ed4092d2b49e0d4eaeb9413d7123
parentda11381402d2259fff3ef8efe1dbdacf0307785e
Merge branch 'master' into atif-shaikh-CRM-15979

Conflicts:
CRM/Upgrade/Incremental/sql/4.6.beta3.mysql.tpl
CRM/Upgrade/Incremental/sql/4.6.beta3.mysql.tpl