]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git://gitorious.org/+socialites/statusnet/gnu-social
authorMikael Nordfeldth <mmn@hethane.se>
Sun, 23 Feb 2014 13:58:55 +0000 (14:58 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sun, 23 Feb 2014 14:00:53 +0000 (15:00 +0100)

Trivial merge