Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-12-16-00-15
authorKurund Jalmi <kurund@yahoo.com>
Mon, 12 Oct 2015 16:12:55 +0000 (17:12 +0100)
committerKurund Jalmi <kurund@yahoo.com>
Mon, 12 Oct 2015 16:12:55 +0000 (17:12 +0100)
commit2bcf3e5b72a945c90d882750227fa62670b980d6
treec29f47353f062681bd54626c951bdd15336f4290
parent70ff00f85b85f660ef88ca4adce1745e5ac02dcf
parent4fa8939d9fd46d52955e2ea1a38bc1a4e5576170
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-12-16-00-15

Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Price/Form/Field.php
CRM/Price/Form/Option.php
api/v3/utils.php