Merge commit 'c940014dce8bd' into 4.5-missing-prs
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:37 +0000 (16:24 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:37 +0000 (16:24 -0800)
commit06de146ebc52906d0c9805c75bb8dbfdc4a6aa8a
treec119557a751352eae555bc506ffc775ff6278302
parent53cc5b88dfc2d12f529cdbd0be88511b90507047
parentc940014dce8bd5001aa5fdb08aee7b8b5809d4e7
Merge commit 'c940014dce8bd' into 4.5-missing-prs