Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-29-13-19-52
authorkurund <kurund@civicrm.org>
Mon, 29 Sep 2014 12:19:58 +0000 (13:19 +0100)
committerkurund <kurund@civicrm.org>
Mon, 29 Sep 2014 12:19:58 +0000 (13:19 +0100)
commit2ac8532edbec25162652efef29faad9f41638ef5
tree9389f6430a5615725cd5a9791b462d0e4497f68d
parentcb0a87861e494ddc1aa83a740330973629bdf538
parent68acd6ae8e764d8e713829675cfadfdefff770e8
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-29-13-19-52