]> 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>
Tue, 30 Nov 2010 19:46:45 +0000 (14:46 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 30 Nov 2010 19:46:45 +0000 (14:46 -0500)

Trivial merge