]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/28' of https://gitorious.org/social/mainline into...
authorMikael Nordfeldth <mmn@hethane.se>
Thu, 8 Jan 2015 15:48:42 +0000 (16:48 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Thu, 8 Jan 2015 15:48:42 +0000 (16:48 +0100)

Trivial merge