From: Kurund Jalmi <kurund@civicrm.org>
Date: Thu, 6 Jun 2013 05:50:09 +0000 (-0700)
Subject: Merge pull request #968 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b6026cd8f43ce41afad0dfcae9d4bbf1912803e2;p=civicrm-core.git

Merge pull request #968 from eileenmcnaughton/master

CRM-12768 caused locblock test to fail
---

b6026cd8f43ce41afad0dfcae9d4bbf1912803e2