gnu-social/plugins/Geonames
Brion Vibber 59119482ca Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php
2010-10-04 12:54:36 -07:00
..
locale Localisation updates from http://translatewiki.net 2010-10-03 22:46:38 +02: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