Merge pull request #878 from pradpnayak/CRM-12470-masterFixes
authorKurund Jalmi <kurund@civicrm.org>
Tue, 28 May 2013 19:06:50 +0000 (12:06 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Tue, 28 May 2013 19:06:50 +0000 (12:06 -0700)
-- CRM fixes for CRM-12470


Trivial merge