]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Sun, 22 Jan 2012 02:12:53 +0000 (21:12 -0500)
committerEvan Prodromou <evan@status.net>
Sun, 22 Jan 2012 02:12:53 +0000 (21:12 -0500)

Trivial merge