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)
commitdf41287226d113f178ef66f320c8568566890fe9
tree26cc4094f89dd76c1d95584c729ec4c32072610a
parent056cce4b5eed28751bbad97e0dc826ee5310ff39
parent61098faf5dd2685ea00c110bb4a3c871da17a300
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
classes/Notice.php
lib/util.php