Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-08-20-53-53
authorkurund <kurund@civicrm.org>
Mon, 8 Sep 2014 15:24:00 +0000 (20:54 +0530)
committerkurund <kurund@civicrm.org>
Mon, 8 Sep 2014 15:24:00 +0000 (20:54 +0530)
commitf486d2c15665c9b374c89de9255d3e21368cb3a2
treeedf54ed4dc1bcdf3c67f0b8dbf08620c5ea804d7
parent193f4d4689b830ea0b862aad340518ea076cee82
parent88c6259e813c523210e799e874ece50131ebe6d7
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-08-20-53-53