]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into socialbookmark
authorEvan Prodromou <evan@status.net>
Sat, 18 Dec 2010 22:26:34 +0000 (17:26 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 18 Dec 2010 22:26:34 +0000 (17:26 -0500)

Trivial merge