Merge pull request #6886 from jaapjansma/CRM-17338
authorDave Greenberg <dave@civicrm.org>
Mon, 5 Oct 2015 22:03:14 +0000 (15:03 -0700)
committerDave Greenberg <dave@civicrm.org>
Mon, 5 Oct 2015 22:03:14 +0000 (15:03 -0700)
Fixed #CRM-17338


Trivial merge