]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 11 Mar 2010 01:04:51 +0000 (17:04 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 11 Mar 2010 01:04:51 +0000 (17:04 -0800)
commitc6f09306b1c72296db8b55500a5d6a2ea8cd5dd2
treed623c7b98c2d99ddac3116b8114b90c1db4e18c6
parent2a426f24c0599710ef170b01f7f7124b7166e12e
parent66518df4356ea878bfd8693191f0354caebfb549
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
classes/File.php
plugins/OStatus/OStatusPlugin.php