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-06-05 11:44:01 +02:00
2011-04-13 15:09:46 -07:00
2011-05-08 10:12:05 +02:00
2011-06-07 16:04:49 -04:00