]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Wed, 16 Jun 2010 19:38:35 +0000 (12:38 -0700)
committerBrion Vibber <brion@pobox.com>
Wed, 16 Jun 2010 19:38:35 +0000 (12:38 -0700)
Conflicts:
plugins/OpenID/openidserver.php

1  2 
lib/installer.php
plugins/OpenID/openidserver.php

Simple merge
Simple merge