]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into msn-plugin
authorLuke Fitzgerald <darkip@inflatablegoldfish.com>
Thu, 17 Mar 2011 20:00:06 +0000 (20:00 +0000)
committerLuke Fitzgerald <darkip@inflatablegoldfish.com>
Thu, 17 Mar 2011 20:00:06 +0000 (20:00 +0000)

Trivial merge