]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 28 Dec 2009 23:50:41 +0000 (15:50 -0800)
committerEvan Prodromou <evan@status.net>
Mon, 28 Dec 2009 23:50:41 +0000 (15:50 -0800)
commita1e599640419bd1ea1f251b9e19e50522bda4de5
tree1258d1b3a8d5d97415183193b3404243bbc32595
parente119362fde9eabb27d48c94a98624aeae68e436c
parentb5be659af0fc943d6f7893d1b7937493ca44c597
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
scripts/setconfig.php