Brion Vibber 99194e03fa Merge branch '1.0.x' into schema-x ... Conflicts: plugins/OStatus/classes/Ostatus_profile.php		2010-10-06 17:16:13 -07:00
..
FeedSub.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
HubSub.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
Magicsig.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00
Ostatus_profile.php	Merge branch '1.0.x' into schema-x	2010-10-06 17:16:13 -07:00
Ostatus_source.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00