]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
authorEvan Prodromou <evan@status.net>
Tue, 24 Apr 2012 01:02:22 +0000 (21:02 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 24 Apr 2012 01:02:22 +0000 (21:02 -0400)

Trivial merge