]> 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>
Wed, 31 Mar 2010 19:48:24 +0000 (12:48 -0700)
committerBrion Vibber <brion@pobox.com>
Wed, 31 Mar 2010 19:48:24 +0000 (12:48 -0700)
1  2 
lib/util.php

diff --cc lib/util.php
Simple merge