Merge commit 'refs/merge-requests/39' of https://gitorious.org/social/mainline into...
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 9 Feb 2015 10:35:19 +0000 (11:35 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 9 Feb 2015 10:35:19 +0000 (11:35 +0100)

Trivial merge