]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/12' of git://gitorious.org/statusnet/gnu-social...
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 31 Mar 2014 10:36:55 +0000 (12:36 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 31 Mar 2014 10:36:55 +0000 (12:36 +0200)

Trivial merge