]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Thu, 25 Feb 2010 19:57:21 +0000 (11:57 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 25 Feb 2010 19:57:21 +0000 (11:57 -0800)
1  2 
lib/util.php

diff --cc lib/util.php
Simple merge