Merge branch 'master' of git.gnu.io:gnu/gnu-social
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 16 Jan 2016 23:40:14 +0000 (00:40 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 16 Jan 2016 23:40:14 +0000 (00:40 +0100)

Trivial merge