Merge commit 'd8f34a6e5245e' into 4.5-missing-prs
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:25:01 +0000 (16:25 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:25:01 +0000 (16:25 -0800)
commite562e4ebc9c7637002ff32c18c2903e129bb2510
tree22a380458d0ce0e594aa47815425eb78ce7b5bb2
parent50a6ee53d3a6acba11af75e93b0442a31fe92cab
parentd8f34a6e5245eab54c4befd4ca844eb05b888d35
Merge commit 'd8f34a6e5245e' into 4.5-missing-prs