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)

Trivial merge