Merge commit '7aa3a631943cb' into 4.5-missing-prs
authorTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:25:54 +0000 (16:25 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 6 Mar 2015 00:25:54 +0000 (16:25 -0800)

Trivial merge