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)
commit771f08b3c761ff122c3fff7bdb13ec6625828018
tree19dc559192f87ca4fda1390bc519a76e51aa563a
parent5167b1fa408aa486ad75c8ddd3c71cb568dc84a3
parentbf38fb7befa4459844f3ff39842110f7a9b85bd2
Merge branch 'master' of git.gnu.io:gnu/gnu-social