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)
commitc3e9aa3342e40757db08a2725c80cbe27bf97b0b
tree0867bf3ec1a765e80f93daafacb7744969bb9192
parent0c66d5bd67a5e3819aff78986a87d0571b3de75d
parente32e663dddae93274cc28fd0539e48a98edbe8df
Merge pull request #5503 from civicrm/4.6

Merge 4.6 into master