Merge commit '8939b4b21c001' into 4.5-missing-prs
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:51 +0000 (16:24 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:51 +0000 (16:24 -0800)
commit50a6ee53d3a6acba11af75e93b0442a31fe92cab
treec6dfab1d0d67d445aa8c5cd36ceb4a6ab66939ec
parent892da4a9850da99e44b28e1a12315baf94c63296
parent8939b4b21c001242a7215da068a8f88dd4404c15
Merge commit '8939b4b21c001' into 4.5-missing-prs