Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-18-17-14-23
authorTim Otten <totten@civicrm.org>
Fri, 18 Oct 2013 11:44:34 +0000 (17:14 +0530)
committerTim Otten <totten@civicrm.org>
Fri, 18 Oct 2013 11:44:34 +0000 (17:14 +0530)

Trivial merge