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)
commitb6026cd8f43ce41afad0dfcae9d4bbf1912803e2
tree27f5ee5a730a8b3a49398d4bf3dbec59a0eab009
parent7badfe57ccc15fdd6e27038f7ee37d4413ee480c
parent82adafa2621a03556f080a7072e05d60961d6f29
Merge pull request #968 from eileenmcnaughton/master

CRM-12768 caused locblock test to fail