]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Wed, 19 May 2010 19:51:25 +0000 (12:51 -0700)
committerBrion Vibber <brion@pobox.com>
Wed, 19 May 2010 19:51:25 +0000 (12:51 -0700)
commit7005ef66617b265ddccdd9082c2368bf014a7e83
tree52f853c4d47063f0af488a7ff5fb52df50b430bb
parent48dc899acb9a0ac87140353092dab1f5e67753d8
parenta39a934dd4a133bad6e76fa9a5018cedcb70225c
Merge branch 'testing' into 0.9.x

Conflicts:
plugins/OpenID/openidlogin.php
actions/register.php
lib/util.php
locale/en_GB/LC_MESSAGES/statusnet.po
plugins/OpenID/OpenIDPlugin.php
plugins/OpenID/finishaddopenid.php
plugins/OpenID/finishopenidlogin.php
plugins/OpenID/openid.php
plugins/OpenID/openidlogin.php