Merge pull request #1465 from colemanw/CRM-12840
authorKurund Jalmi <kurund@civicrm.org>
Wed, 28 Aug 2013 14:36:44 +0000 (07:36 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Wed, 28 Aug 2013 14:36:44 +0000 (07:36 -0700)
DO NOT MERGE patch for CRM-12840 by Jamie McClelland


Trivial merge