Brion Vibber b1a68e15b7 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x ... Conflicts: lib/default.php lib/util.php plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)		2010-06-10 15:37:06 -07:00
..
locale	Pull localization updates from 0.9.x branch	2010-05-03 12:27:44 -07:00
SimpleUrlPlugin.php	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x	2010-06-10 15:37:06 -07:00