Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-02-07-53-58
authorTim Otten <totten@civicrm.org>
Thu, 2 Oct 2014 06:54:01 +0000 (07:54 +0100)
committerTim Otten <totten@civicrm.org>
Thu, 2 Oct 2014 06:54:01 +0000 (07:54 +0100)
commite5235b0439de1bece3acb8bca950cf3db8c46100
treed67f61774896077c477b629d26825073d5a96365
parent312494bf02f31648403dcc824c454aa15e3a29d4
parent92b0f883315c72514e629b1c9e37261b84186785
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-02-07-53-58