Merge pull request #6249 from eileenmcnaughton/CRM-16850-master
authorDave Greenberg <dave@civicrm.org>
Tue, 21 Jul 2015 21:20:14 +0000 (14:20 -0700)
committerDave Greenberg <dave@civicrm.org>
Tue, 21 Jul 2015 21:20:14 +0000 (14:20 -0700)
CRM-16850 master


Trivial merge