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	Merge branch '0.9.x' into merge	2010-12-07 10:50:05 -08:00
CacheLogPlugin.php	more detailed information in cachelogplugin	2010-10-22 09:24:19 -04:00