Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
authorMikael Nordfeldth <mmn@hethane.se>
Sun, 3 Jan 2016 15:23:07 +0000 (16:23 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sun, 3 Jan 2016 15:23:07 +0000 (16:23 +0100)

Trivial merge