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)
commita45cdae0831ad036a85ac4f5f815c771e137e1c5
tree83ae6672a7a9781adb4e7202b98ff5a252d92e15
parentb52b9e120101087d2c374322e6a0239ac9d2aad9
parent7cea3f9f1185fad49ac9f83c02549a47e213b253
Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into merge-requests/41