]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of git@gitorious.org:laconica/mainline into testing
authorEvan Prodromou <evan@status.net>
Fri, 28 Aug 2009 13:10:46 +0000 (06:10 -0700)
committerEvan Prodromou <evan@status.net>
Fri, 28 Aug 2009 13:10:46 +0000 (06:10 -0700)

Trivial merge