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)
commitaa3028e5d9f2fcf31ab8eaad4540b2765c2a2fd3
tree9e9139ff83abc7df4c777e2cae1e4f935fcef495
parent95d415257a43d5d4338ce22089463c1820b6bf8b
parent3251ef3b518ef9db55fbab0693d8b0f654dcda58
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes