]> 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, 14 Aug 2010 19:08:15 +0000 (12:08 -0700)
committerEvan Prodromou <evan@status.net>
Sat, 14 Aug 2010 19:08:15 +0000 (12:08 -0700)

Trivial merge