]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Fri, 14 May 2010 19:14:02 +0000 (12:14 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 14 May 2010 19:14:02 +0000 (12:14 -0700)
1  2 
actions/register.php
lib/util.php

Simple merge
diff --cc lib/util.php
Simple merge