Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into...
authorMikael Nordfeldth <mmn@hethane.se>
Tue, 10 Feb 2015 17:41:18 +0000 (18:41 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Tue, 10 Feb 2015 17:41:18 +0000 (18:41 +0100)

Trivial merge