Merge pull request #2061 from civicrm/4.3
authorcolemanw <coleman@civicrm.org>
Thu, 21 Nov 2013 01:02:07 +0000 (17:02 -0800)
committercolemanw <coleman@civicrm.org>
Thu, 21 Nov 2013 01:02:07 +0000 (17:02 -0800)
4.3


Trivial merge