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
..
2011-04-08 01:22:02 +02:00
2011-06-06 00:34:57 +02:00
2011-06-06 00:35:12 +02:00
2011-06-06 00:35:40 +02:00
2011-06-06 00:36:31 +02:00
2011-06-06 00:36:50 +02:00