Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-06-14-41-49
authorkurund <kurund@civicrm.org>
Mon, 6 Jul 2015 09:12:10 +0000 (14:42 +0530)
committerkurund <kurund@civicrm.org>
Mon, 6 Jul 2015 09:12:10 +0000 (14:42 +0530)
commitd6fa07ba73acb0263a0bab610fbc27636446205a
tree13f8c7be004972033e9d063a02ec010ed17ffc82
parent8b3bfdc170a426c9eadda04b6fad2d8c091e5803
parent0f855f62917392516e9752b88c5b07fd3b38a5d2
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-06-14-41-49