Merge branch 4.5 into 4.6
authorColeman Watts <coleman@civicrm.org>
Fri, 27 Mar 2015 00:55:22 +0000 (20:55 -0400)
committerColeman Watts <coleman@civicrm.org>
Fri, 27 Mar 2015 00:55:22 +0000 (20:55 -0400)
commite32e663dddae93274cc28fd0539e48a98edbe8df
tree94252711fc15b5ea9c5075bf4023be67cd58a278
parent380dd71127f5642748a23bee0aba7abcd1860d88
parent8b2caea973578f751e02639e904b40c2c29c9048
Merge branch 4.5 into 4.6

Conflicts:
CRM/Event/Form/ManageEvent/Conference.php
CRM/Event/Form/ManageEvent/Conference.php