Merge branch 'master' into update-result
commit8579fc066fc53e939e45f335f82781aa52d773dd
authorStefan Kögl <stefan@skoegl.net>
Sat, 2 Dec 2017 20:36:05 +0000 (2 21:36 +0100)
committerStefan Kögl <stefan@skoegl.net>
Sat, 2 Dec 2017 20:36:05 +0000 (2 21:36 +0100)
tree6e4fdbb949f7c2426b1e2426fb1d922b4322b83f
parente7159ebea49afa0ad4bbfb162a7825ec51b90e51
parent31edcac5808e4635c45ead8a7d9aca51424b7526
Merge branch 'master' into update-result