]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/35' of https://gitorious.org/social/mainline into...
authorMikael Nordfeldth <mmn@hethane.se>
Sun, 8 Feb 2015 10:20:53 +0000 (11:20 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sun, 8 Feb 2015 10:20:53 +0000 (11:20 +0100)

Trivial merge