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)

Trivial merge