]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'hackfest' into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 6 Jun 2015 20:15:39 +0000 (22:15 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 6 Jun 2015 20:15:39 +0000 (22:15 +0200)

Trivial merge