]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Wed, 1 Dec 2010 00:34:52 +0000 (16:34 -0800)
committerBrion Vibber <brion@pobox.com>
Wed, 1 Dec 2010 00:34:52 +0000 (16:34 -0800)
commit749367e12f9742d7fd5ee028230fefa627599125
treeb52d7de6bb389fdc5a0e631d8022f409c2908d21
parent6bdce2b1e5f7250e5309048cfb64eeefa770f3bb
parentb4fc54c308936477706acb5cc3c4acae4c3f3a4d
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
lib/router.php
index.php
lib/router.php