Merge pull request #1352 from eileenmcnaughton/CRM-13159
authorKurund Jalmi <kurund@civicrm.org>
Wed, 7 Aug 2013 07:04:15 +0000 (00:04 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Wed, 7 Aug 2013 07:04:15 +0000 (00:04 -0700)
Crm 13159 plus a couple of minor fixes


Trivial merge