Merge commit '762fe6d92bc' into 4.5-missing-prs
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:33 +0000 (16:24 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:33 +0000 (16:24 -0800)
commit53cc5b88dfc2d12f529cdbd0be88511b90507047
treedc57460ea61318d1b956c480d36f1f27d90603db
parentb41e60c765dc0a634b134ec97a431589a9452882
parent762fe6d92bc577a62b6ff271e8fbeca4893b842a
Merge commit '762fe6d92bc' into 4.5-missing-prs