gnu-social/plugins/Directory/locale/mk
Evan Prodromou a10edb3183 Merge branch 'testing' into 1.0.x
Conflicts:
	plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
	plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
2011-06-07 16:04:49 -04:00
..
LC_MESSAGES Merge branch 'testing' into 1.0.x 2011-06-07 16:04:49 -04:00