Brion Vibber e79034e163 Merge branch '0.9.x' into 1.0.x ... Conflicts: plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po		2010-12-16 15:56:19 -08:00
..
locale	Localisation updates from http://translatewiki.net.	2010-12-16 16:30:30 +01:00
GeonamesPlugin.php	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x	2010-10-04 12:54:36 -07:00