Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-14-51-22
authorTim Otten <totten@civicrm.org>
Mon, 29 Sep 2014 13:51:25 +0000 (14:51 +0100)
committerTim Otten <totten@civicrm.org>
Mon, 29 Sep 2014 13:51:25 +0000 (14:51 +0100)

Trivial merge