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

Trivial merge