Evan Prodromou b5cfcba471 Merge branch '0.9.x' into activityexport ... Conflicts: plugins/OStatus/OStatusPlugin.php		2010-09-22 10:45:34 -04: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 '0.9.x' into activityexport	2010-09-22 10:45:34 -04:00
Ostatus_source.php	* i18n/L10n update	2010-09-19 15:17:36 +02:00