]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/gnu-social
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 15 Mar 2014 13:06:07 +0000 (14:06 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 15 Mar 2014 13:06:07 +0000 (14:06 +0100)

Trivial merge