Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
authorMikael Nordfeldth <mmn@hethane.se>
Tue, 5 Jan 2016 23:24:41 +0000 (00:24 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Tue, 5 Jan 2016 23:24:41 +0000 (00:24 +0100)
commit31c8416a8f97a7fa7bd8e84252403d00f669a759
tree53d781216447c783562db3744fd34b2891bf22d3
parent792b62874e13214dc12480acd2cf4a40b3292d79
parent956e053da6e7efb27f00b4d4195a832a8c298a45
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes