Merge pull request #410 from dlobo/CRM-12333
authorKurund Jalmi <kurund@civicrm.org>
Fri, 12 Apr 2013 19:02:29 +0000 (12:02 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Fri, 12 Apr 2013 19:02:29 +0000 (12:02 -0700)
CRM-12333 and lots of formatting fixes


Trivial merge