]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 10 by hannesmannerheim
authorMikael Nordfeldth <mmn@hethane.se>
Fri, 10 Oct 2014 18:50:40 +0000 (20:50 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Fri, 10 Oct 2014 18:50:40 +0000 (20:50 +0200)

Trivial merge