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

Trivial merge