Merge commit 'e2d85c92c3232' into 4.5-missing-prs
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:25:28 +0000 (16:25 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:25:28 +0000 (16:25 -0800)
commit9524b0f46e05d79886e39b4b7cd5d9b8db27d0ff
tree3137d607a121a3c135879433dc2d5ec30517c427
parent34e10905769137dd989dea991083e3dc2797b8ec
parente2d85c92c323203c9c7d8f9303a9f0f9819dc7e1
Merge commit 'e2d85c92c3232' into 4.5-missing-prs

Conflicts:
xml/version.xml