]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Sat, 16 Jan 2010 15:48:59 +0000 (07:48 -0800)
committerEvan Prodromou <evan@status.net>
Sat, 16 Jan 2010 15:48:59 +0000 (07:48 -0800)

Trivial merge