]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git.gnu.io:aroque/gnu-social
authoraroquen <aroquen@sfr.fr>
Sun, 7 Jun 2015 10:59:57 +0000 (12:59 +0200)
committeraroquen <aroquen@sfr.fr>
Sun, 7 Jun 2015 10:59:57 +0000 (12:59 +0200)

Trivial merge