Merge pull request #2116 from civicrm/4.4
authorcolemanw <coleman@civicrm.org>
Thu, 28 Nov 2013 01:04:58 +0000 (17:04 -0800)
committercolemanw <coleman@civicrm.org>
Thu, 28 Nov 2013 01:04:58 +0000 (17:04 -0800)
Merge branch 4.4 into master


Trivial merge