Merge remote-tracking branch 'origin/4.5' into 4.5-master-2014-09-14-14-18-24
authorTim Otten <totten@civicrm.org>
Sun, 14 Sep 2014 18:18:25 +0000 (14:18 -0400)
committerTim Otten <totten@civicrm.org>
Sun, 14 Sep 2014 18:18:25 +0000 (14:18 -0400)
commitc770a972f7d0242c62e12981b14f5af207b92c9b
tree16624fc6579815382584f33c48f9336bbc3e9157
parentf486d2c15665c9b374c89de9255d3e21368cb3a2
parente913987d303f2c51e60be23820fc8d1031e7eadd
Merge remote-tracking branch 'origin/4.5' into 4.5-master-2014-09-14-14-18-24