Merge branch 'PalanteJon-CRM-17552-v2'
authorColeman Watts <coleman@civicrm.org>
Mon, 18 Jan 2016 19:37:40 +0000 (14:37 -0500)
committerColeman Watts <coleman@civicrm.org>
Mon, 18 Jan 2016 19:37:40 +0000 (14:37 -0500)
commit8f296cd88857e806e0f6af35a848e9c8a1312390
tree6c5042c3e75bc16ee8009e3826aa2727d38e4b3b
parent8c22fd736896761e7b93862357eedc0ac2ac6ea9
parentd9883c8267f5953418278b5bfcf127e1a814fa8c
Merge branch 'PalanteJon-CRM-17552-v2'

Conflicts:
CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl