Merge pull request #5503 from civicrm/4.6
authorcolemanw <coleman@civicrm.org>
Fri, 27 Mar 2015 00:57:55 +0000 (20:57 -0400)
committercolemanw <coleman@civicrm.org>
Fri, 27 Mar 2015 00:57:55 +0000 (20:57 -0400)
Merge 4.6 into master


Trivial merge