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
..
extlib/Net	Move the bundled Net/LDAP2 library to the LdapCommon directory	2010-03-23 21:57:47 -04:00
LdapCommon.php	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x	2010-10-04 12:54:36 -07:00
MemcacheSchemaCache.php	* i18n/L10n updates.	2010-09-20 20:54:30 +02:00