]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Tue, 20 Apr 2010 11:52:58 +0000 (13:52 +0200)
committerBrion Vibber <brion@pobox.com>
Tue, 20 Apr 2010 11:52:58 +0000 (13:52 +0200)
1  2 
classes/Notice.php
lib/util.php

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