Merge branch 4.5 into master
authorColeman Watts <coleman@civicrm.org>
Mon, 16 Feb 2015 18:49:29 +0000 (13:49 -0500)
committerColeman Watts <coleman@civicrm.org>
Mon, 16 Feb 2015 18:49:29 +0000 (13:49 -0500)

Trivial merge