]> 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>
Fri, 26 Feb 2010 20:33:50 +0000 (12:33 -0800)
committerBrion Vibber <brion@pobox.com>
Fri, 26 Feb 2010 20:33:50 +0000 (12:33 -0800)
1  2 
plugins/OStatus/OStatusPlugin.php

Simple merge