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
..
groupsalmon.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
ostatusgroup.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
ostatusinit.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
ostatussub.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
ownerxrd.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
pushcallback.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
pushhub.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
usersalmon.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
userxrd.php	Add a comment in UserxrdAction warning future maintainers not to break domain migrations if adding domain checking to the webfinger lookup in future.	2010-09-27 11:38:26 -07:00