]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Wed, 17 Mar 2010 14:38:39 +0000 (09:38 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 17 Mar 2010 14:38:39 +0000 (09:38 -0500)
commit4761c07ad8d76f7c34d4db53d32d15e806ba1e88
treeeb3d78ccde1778037165c92b6ec36c7465b54345
parentf21f78364a9cbde2ca535a3983b384707ad097ae
parentf62b8a80cf33ac8529d0736c51dc060a9d235369
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
plugins/OStatus/lib/discovery.php
plugins/OStatus/lib/feeddiscovery.php