]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/6' of git://gitorious.org/statusnet/gnu-social...
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 4 Jan 2014 20:27:28 +0000 (21:27 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 4 Jan 2014 20:27:28 +0000 (21:27 +0100)

Trivial merge