Merge pull request #5626 from eileenmcnaughton/4.6
authorcolemanw <coleman@civicrm.org>
Wed, 15 Apr 2015 22:05:53 +0000 (18:05 -0400)
committercolemanw <coleman@civicrm.org>
Wed, 15 Apr 2015 22:05:53 +0000 (18:05 -0400)
CRM-16290 fix fatal on relationship edit


Trivial merge