]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git://gitorious.org/laconica/mainline into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 18 Feb 2009 23:31:28 +0000 (23:31 +0000)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 18 Feb 2009 23:31:28 +0000 (23:31 +0000)

Trivial merge