Merge pull request #326 from dlobo/CRM-12282
authorDave Greenberg <dave@civicrm.org>
Thu, 4 Apr 2013 18:38:35 +0000 (11:38 -0700)
committerDave Greenberg <dave@civicrm.org>
Thu, 4 Apr 2013 18:38:35 +0000 (11:38 -0700)
CRM-12282


Trivial merge