Merge commit '9942d1dc86' into 4.5-missing-prs
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:27 +0000 (16:24 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:27 +0000 (16:24 -0800)
commitb41e60c765dc0a634b134ec97a431589a9452882
treed3d52c324ecaafc70d79f4543def3010bc96cd4d
parent8f1d62cd6d7c07fa73caea9d9160512bcb98e756
parent9942d1dc860f538a47661d905a9819ab47b17883
Merge commit '9942d1dc86' into 4.5-missing-prs