Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-13-10-47
authorkurund <kurund@civicrm.org>
Mon, 29 Sep 2014 12:17:27 +0000 (13:17 +0100)
committerkurund <kurund@civicrm.org>
Mon, 29 Sep 2014 12:17:27 +0000 (13:17 +0100)
commit68acd6ae8e764d8e713829675cfadfdefff770e8
treeb95bf26035f46bc885063b1b86743a5f2cef9004
parent10b48f9c9d7bb081df4b315abd3cbe5ef0ab5843
parent8cd4dfae9e178e800ac67a6977d4a3a3f204d448
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-13-10-47

Conflicts:
CRM/Core/Payment.php
CRM/Core/Payment.php