Merge commit 'refs/merge-requests/31' of https://gitorious.org/social/mainline into...
authorMikael Nordfeldth <mmn@hethane.se>
Sun, 8 Feb 2015 22:18:36 +0000 (23:18 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sun, 8 Feb 2015 22:18:36 +0000 (23:18 +0100)
commitfb9d32a8afdabd2a094f25fbba9c937bc9f0e7c5
tree7e3418a2c538bde0e1568396c585224bc704fad2
parent39dce9e348410b0f5e16d4c8176d01d2d0a7215e
parentb953acf3c5158dc02c431267b85814a1ca6539a4
Merge commit 'refs/merge-requests/31' of https://gitorious.org/social/mainline into merge-requests/31