From: Evan Prodromou Date: Tue, 7 Jun 2011 20:04:49 +0000 (-0400) Subject: Merge branch 'testing' into 1.0.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a10edb3183928d40c0567ea912a2530ebfb17683;p=quix0rs-gnu-social.git Merge branch 'testing' into 1.0.x Conflicts: plugins/Directory/locale/mk/LC_MESSAGES/Directory.po plugins/Directory/locale/tl/LC_MESSAGES/Directory.po --- a10edb3183928d40c0567ea912a2530ebfb17683