Merge pull request #1669 from PalanteJon/CRM-13405
authorDave Greenberg <dave@civicrm.org>
Tue, 24 Sep 2013 01:27:31 +0000 (18:27 -0700)
committerDave Greenberg <dave@civicrm.org>
Tue, 24 Sep 2013 01:27:31 +0000 (18:27 -0700)
Crm-13405


Trivial merge