]> 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>
Wed, 29 Dec 2010 22:53:38 +0000 (14:53 -0800)
committerEvan Prodromou <evan@status.net>
Wed, 29 Dec 2010 22:53:38 +0000 (14:53 -0800)

Trivial merge