Merge commit '1ad799fac8340' into 4.5-missing-prs
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:42 +0000 (16:24 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:42 +0000 (16:24 -0800)
commit344e328569abca114f316c9b8ba70a79fdb6d597
treeb984d757046b41dc2fe9eee259bd0aa845ad9c26
parent06de146ebc52906d0c9805c75bb8dbfdc4a6aa8a
parent1ad799fac8340302b6c2cfdc97a845d647aa948d
Merge commit '1ad799fac8340' into 4.5-missing-prs