Merge pull request #968 from eileenmcnaughton/master
authorKurund Jalmi <kurund@civicrm.org>
Thu, 6 Jun 2013 05:50:09 +0000 (22:50 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Thu, 6 Jun 2013 05:50:09 +0000 (22:50 -0700)
CRM-12768 caused locblock test to fail


Trivial merge