Merge pull request #335 from dlobo/CRM-12290
authorKurund Jalmi <kurund@civicrm.org>
Sun, 7 Apr 2013 22:11:06 +0000 (15:11 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Sun, 7 Apr 2013 22:11:06 +0000 (15:11 -0700)
CRM-12290


Trivial merge