Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-16-27-01
authorTim Otten <totten@civicrm.org>
Thu, 5 Dec 2013 00:27:04 +0000 (16:27 -0800)
committerTim Otten <totten@civicrm.org>
Thu, 5 Dec 2013 00:27:04 +0000 (16:27 -0800)

Trivial merge