Merge branch 'master' into update-result
commiteac037fd25dae84c63a2d521f0195b552337f1d9
authorStefan Kögl <stefan@skoegl.net>
Sun, 6 Aug 2017 13:23:23 +0000 (6 15:23 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sun, 6 Aug 2017 13:23:23 +0000 (6 15:23 +0200)
tree6bbbc2f0390a8ed2986b22914ad75200422a4f6e
parent1e6a633d09d0e5f6a5a44f24b12216e464f3f8b6
parentf74732814ce95cd052af3efbf8f4de7599752c7a
Merge branch 'master' into update-result