Merge branch 'CRM-13331' of https://github.com/eileenmcnaughton/civicrm-core into...
authorColeman Watts <coleman@civicrm.org>
Wed, 11 Sep 2013 14:03:14 +0000 (09:03 -0500)
committerColeman Watts <coleman@civicrm.org>
Wed, 11 Sep 2013 14:03:14 +0000 (09:03 -0500)

Trivial merge