]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Sat, 11 Dec 2010 16:01:05 +0000 (11:01 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 11 Dec 2010 16:01:05 +0000 (11:01 -0500)

Trivial merge