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

Trivial merge