Brion Vibber ca489631db Merge branch '0.9.x' into 1.0.x ...

Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php

2010-10-25 13:08:57 -07:00

..

locale

Localisation updates from http://translatewiki.net.

2010-10-23 20:50:55 +02:00

PtitUrlPlugin.php

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

2010-06-10 15:37:06 -07:00