]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 8 Feb 2010 23:48:52 +0000 (15:48 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 8 Feb 2010 23:48:52 +0000 (15:48 -0800)
1  2 
lib/api.php
lib/util.php

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