merge

Author git <vivec@telvanni.eu>
Author date 2018-04-10 15:53:36
Author local date 2018-04-10 17:53:36 +0200
Committer git <vivec@telvanni.eu>
Committer date 2018-04-10 15:53:36
Committer local date 2018-04-10 17:53:36 +0200
Commit 4f15f40ddaebacaefdce1df6e0669d8d8031bb6a
Tree 52d34ce566b5530329411ce7b2f073ceed97fc97
Parent bade0be10167aa533ffb46bf7f6ebd54e7bc2586
Parent a02e25fc63232f9b8d9bf9b3b61a7f0865ec9a58
merge