]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Wed, 24 Feb 2010 20:38:38 +0000 (20:38 +0000)
committerBrion Vibber <brion@pobox.com>
Wed, 24 Feb 2010 20:38:38 +0000 (20:38 +0000)
1  2 
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php

Simple merge