]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into prefillbookmark
authorEvan Prodromou <evan@status.net>
Fri, 15 Apr 2011 01:55:16 +0000 (21:55 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 15 Apr 2011 01:55:16 +0000 (21:55 -0400)

Trivial merge