Merge pull request #3687 from GinkgoFJG/CRM-14990-2
authorDave Greenberg <dave@civicrm.org>
Wed, 16 Jul 2014 22:55:47 +0000 (15:55 -0700)
committerDave Greenberg <dave@civicrm.org>
Wed, 16 Jul 2014 22:55:47 +0000 (15:55 -0700)
CRM-14990: Round two.


Trivial merge