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

..

locale

Merge branch '1.0.x' into schema-x

2010-10-06 17:16:13 -07:00

CacheLogPlugin.php

* L10n update

2010-09-19 00:17:24 +02:00