Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-09-16-14-05
authorKurund Jalmi <kurund@yahoo.com>
Fri, 9 Oct 2015 15:25:22 +0000 (16:25 +0100)
committerKurund Jalmi <kurund@yahoo.com>
Fri, 9 Oct 2015 15:25:22 +0000 (16:25 +0100)
commit6452eea7dabeb2e8e68a0cfcafd38c07f15d4c6c
tree3b2b489e96213993a8919c6eb99750c8b7e32685
parent374c5d02184c2789a50da5eaae341ff9eb7db892
parent7137f9d7cacd9ad627594b1146be7885081a36cd
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-09-16-14-05

Conflicts:
CRM/Core/Payment/Form.php
CRM/Core/BAO/CustomField.php
CRM/Core/Payment.php
CRM/Member/Form/Search.php
distmaker/dists/common.sh