From: Zach Copley Date: Wed, 18 Nov 2009 20:48:17 +0000 (-0800) Subject: Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8f2db3820f6ab2c8881521c0adc9a6427b5ea86b;p=quix0rs-gnu-social.git Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x * '0.9.x' of gitorious.org:statusnet/mainline: Terminology consistency fix: 'Unlock' -> 'Unblock' in unblock form description. Localisation updates from !translatewiki !StatusNet Check for dupe from insertNoticeItem() --- 8f2db3820f6ab2c8881521c0adc9a6427b5ea86b