Merge commit 'b02664034bd2' into 4.5-missing-prs
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:15 +0000 (16:24 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:24:15 +0000 (16:24 -0800)
commit8f1d62cd6d7c07fa73caea9d9160512bcb98e756
tree929c872cd01beb20686112cf20aba05627d5a62d
parent3ea8b963f5db7517f1f862b16227c281b2ae3658
parentb02664034bd2a91aed87b0a8c504ef55f7405c03
Merge commit 'b02664034bd2' into 4.5-missing-prs