summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-11-18 17:04:42 -0500
committerCraig Andrews <candrews@integralblue.com>2009-11-18 17:04:42 -0500
commitcac5a417f2a81b974781d4dbc40fd9d718a7a7f2 (patch)
treeac4798b1acd4abbe1674af08af99460374bda537 /lib
parenta00141a180d54cbcc244e0157c72f53ac53779b3 (diff)
parent199ccdb53fbd732eeced3edf734e39687729da9b (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib')
-rw-r--r--lib/unblockform.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/unblockform.php b/lib/unblockform.php
index 4fe28b21a..2a444f7cd 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -77,6 +77,6 @@ class UnblockForm extends ProfileActionForm
function description()
{
- return _('Unlock this user');
+ return _('Unblock this user');
}
}