Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Fri, 10 Jul 2015 14:03:41 +0000 (16:03 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Fri, 10 Jul 2015 14:03:41 +0000 (16:03 +0200)

Trivial merge