]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/26' of https://gitorious.org/social/mainline into...
authorMikael Nordfeldth <mmn@hethane.se>
Tue, 9 Dec 2014 12:45:15 +0000 (13:45 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Tue, 9 Dec 2014 12:45:15 +0000 (13:45 +0100)

Trivial merge