Merge commit 'refs/merge-requests/36' of https://gitorious.org/social/mainline into...
authorMikael Nordfeldth <mmn@hethane.se>
Sun, 8 Feb 2015 22:11:47 +0000 (23:11 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sun, 8 Feb 2015 22:11:47 +0000 (23:11 +0100)
commit39dce9e348410b0f5e16d4c8176d01d2d0a7215e
tree90a2205f7be8703d25c4db1ee97553302ec6b1ed
parent427a6e39eed72f16bebba981eedeb3a8b2b99453
parent11053431d6ffee8a4a6e7c702183ba39a29c7dc8
Merge commit 'refs/merge-requests/36' of https://gitorious.org/social/mainline into merge-requests/36