]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Wed, 11 Aug 2010 06:36:13 +0000 (23:36 -0700)
committerEvan Prodromou <evan@status.net>
Wed, 11 Aug 2010 06:36:13 +0000 (23:36 -0700)

Trivial merge