Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-29-14-51-41
authorTim Otten <totten@civicrm.org>
Mon, 29 Sep 2014 13:51:44 +0000 (14:51 +0100)
committerTim Otten <totten@civicrm.org>
Mon, 29 Sep 2014 13:51:44 +0000 (14:51 +0100)
commite7357d68def12972933d694da2ab7a7067723c9a
treed92165b1b3280cc4e317ca100eae1dc794221101
parent2ac8532edbec25162652efef29faad9f41638ef5
parenta5d44edbee5498fa4195c5f3571db6b820185fa8
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-29-14-51-41