Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 27 May 2010 21:57:32 +0000 (14:57 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 27 May 2010 21:57:32 +0000 (14:57 -0700)
commit696aeea113b88fd0f6b7c4c88eebc2f4f369d245
treec16f91a270c2989f8e6b3799b2dfa3e39698f565
parentcc25ec175530a691686087db4c23a1a28ffd1b62
parent2f2fa100715f9c09b2b91a2d1afddacf7b7f16db
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
lib/language.php
plugins/OpenID/finishaddopenid.php
actions/apitimelinefriends.php
actions/apitimelinehome.php
actions/apitimelinepublic.php
classes/File.php
classes/Notice.php
lib/atomgroupnoticefeed.php
lib/atomusernoticefeed.php
lib/language.php
plugins/OpenID/finishaddopenid.php
plugins/OpenID/finishopenidlogin.php
plugins/OpenID/openid.php