Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 7 Jun 2010 17:19:40 +0000 (10:19 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 7 Jun 2010 17:19:40 +0000 (10:19 -0700)
commitd88b208edcb75ec864e09bb3ab29785b35064400
tree6a3b2eb35fb792bffb7ebaf3b4f81fb1131466d1
parenta7e33ac89df9f05b7497bfb34c6e69b3329a87e5
parent41e9dba7297d43b7de0cb7665901869910d1047a
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
plugins/OpenID/openid.php
actions/apistatusesdestroy.php
classes/Notice.php
lib/language.php
lib/util.php
plugins/OpenID/openid.php
plugins/OpenID/openidlogin.php