Merge branch 'CRM-15365' into 4.5
authorColeman Watts <coleman@civicrm.org>
Fri, 26 Sep 2014 20:45:30 +0000 (16:45 -0400)
committerColeman Watts <coleman@civicrm.org>
Fri, 26 Sep 2014 20:45:30 +0000 (16:45 -0400)

Trivial merge