]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Mon, 20 Feb 2012 15:59:14 +0000 (10:59 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 20 Feb 2012 15:59:14 +0000 (10:59 -0500)

Trivial merge