Merge pull request #4252 from civicrm/4.4
authorcolemanw <coleman@civicrm.org>
Sun, 28 Sep 2014 01:07:17 +0000 (21:07 -0400)
committercolemanw <coleman@civicrm.org>
Sun, 28 Sep 2014 01:07:17 +0000 (21:07 -0400)
Merge branch 4.4 into 4.5


Trivial merge