Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-03-23-18-45-28
authorkurund <kurund@civicrm.org>
Mon, 23 Mar 2015 13:15:33 +0000 (18:45 +0530)
committerkurund <kurund@civicrm.org>
Mon, 23 Mar 2015 13:15:33 +0000 (18:45 +0530)
commit6b3ee0c3815dca3b70fd03405c70f33fb2d2aa75
tree6036835590219a11619d88594917bc8b47df856f
parent208b932d2368075dd8156029d76e39d6f0860982
parentfd57ced7b04d32d5fab5e68c1b12aedbf35c2ad8
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-03-23-18-45-28