]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Tue, 5 Apr 2011 00:32:06 +0000 (17:32 -0700)
committerZach Copley <zach@status.net>
Tue, 5 Apr 2011 00:32:06 +0000 (17:32 -0700)
* '1.0.x' of gitorious.org:statusnet/mainline:
  Style for QnA plugin.


Trivial merge