]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'twitterpriv' into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 18 Jun 2009 18:19:25 +0000 (11:19 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 18 Jun 2009 18:19:25 +0000 (11:19 -0700)

Trivial merge