Merge pull request #4912 from eileenmcnaughton/minor-tidies
authorcolemanw <coleman@civicrm.org>
Mon, 12 Jan 2015 22:39:19 +0000 (17:39 -0500)
committercolemanw <coleman@civicrm.org>
Mon, 12 Jan 2015 22:39:19 +0000 (17:39 -0500)
phpdoc fixes


Trivial merge