]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/23' of https://gitorious.org/social/mainline into...
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 6 Dec 2014 19:12:17 +0000 (20:12 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 6 Dec 2014 19:12:17 +0000 (20:12 +0100)

Trivial merge