Merge branch 4.6 into master
authorColeman Watts <coleman@civicrm.org>
Thu, 5 Nov 2015 19:37:05 +0000 (14:37 -0500)
committerColeman Watts <coleman@civicrm.org>
Thu, 5 Nov 2015 19:37:05 +0000 (14:37 -0500)
commitec9a1e0b013e3c7a99a099247eb138a362bc307e
treebae09c9d4c458061fdf40d9868a2c35574720b7c
parent092728826b55cc6a3695ab2f2258426bcc85a55e
parent6b9e913aaf76e83cab586d3183f22e63ee68d3f9
Merge branch 4.6 into master

Conflicts:
CRM/Member/BAO/Query.php
sql/civicrm_generated.mysql
xml/version.xml
CRM/Contact/BAO/Relationship.php
CRM/Contribute/Form/Task/Invoice.php
CRM/Member/BAO/MembershipStatus.php
CRM/Member/BAO/Query.php
CRM/Report/Form/Mailing/Detail.php
templates/CRM/Custom/Page/Option.tpl