gnu-social/plugins/PtitUrl
Brion Vibber 9df856e667 Merge branch '0.9.x' into merge
Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
..
locale Localisation updates from http://translatewiki.net. 2010-11-29 20:28:28 +01:00
PtitUrlPlugin.php Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-10 15:37:06 -07:00