]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Sun, 3 Jan 2010 16:38:55 +0000 (06:38 -1000)
committerEvan Prodromou <evan@status.net>
Sun, 3 Jan 2010 16:38:55 +0000 (06:38 -1000)

Trivial merge