Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-03-16-17-26-57
authorkurund <kurund@civicrm.org>
Mon, 16 Mar 2015 11:57:14 +0000 (17:27 +0530)
committerkurund <kurund@civicrm.org>
Mon, 16 Mar 2015 11:57:14 +0000 (17:27 +0530)
commit54ffaf3ebb5da47981c16cbc8b05690305b03f60
tree258da9df92b16c31cc839a2e69621a5b2e305ad3
parentcc68bc068265afb829432e01d110d48b7752052f
parent65742a3ed0f9444378e73bdab10469176f07ce49
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-03-16-17-26-57