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

Trivial merge