projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4af6b76 284735f)
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-03-23-41-12
authorkurund <kurund@civicrm.org>
Mon, 4 May 2015 03:48:13 +0000 (23:48 -0400)
committerkurund <kurund@civicrm.org>
Mon, 4 May 2015 03:48:13 +0000 (23:48 -0400)
commit6e1a96bec4660bb24e8f6f8202a04ef5139fda8b
treeaa3a825d039bb6c871ad9a2ec84d5ae1cee76e38tree | snapshot (zip tar.gz)
parent4af6b761f9138407bd03658f28932080f4a59060commit | diff
parent284735f52101a907f60a8b5ea002f91bd6d480decommit | diff
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-03-23-41-12

Conflicts:
CRM/Report/Form/Contribute/TopDonor.php
CRM/Contribute/BAO/Query.php diff1 | diff2 | blob | history
CRM/Report/Form/Contribute/TopDonor.php diff1 | diff2 | blob | history