]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 18 Feb 2010 00:52:46 +0000 (16:52 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 18 Feb 2010 00:52:46 +0000 (16:52 -0800)
1  2 
lib/default.php
lib/iomaster.php

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