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)
commit2688b45b572626694c67f912ef3b0d7556426550
treefbf9ec61477334cb12020f3226e76a8ea2d16643
parent68df780c59b99ef5ba6ba6af1d4fc47821dd7927
parent7fb02674e5ba9b3ad369a837499ba50ed1c7465e
Merge commit 'refs/merge-requests/43' of https://gitorious.org/social/mainline into merge-requests/43