merge
authorJan Szejko <janek37@gmail.com>
Wed, 14 Sep 2016 10:54:00 +0000 (12:54 +0200)
committerJan Szejko <janek37@gmail.com>
Wed, 14 Sep 2016 10:54:00 +0000 (12:54 +0200)
commit93da6796796d43def17c8adde0f194489cc14b01
tree1354a5fd10c4996693a20ce41c43b6692a00b11a
parentba4d47a60b26ae4eba124cdfedc6ae76a7453dbb
parent20785520a46a699410126303b3969abf214a68c8
merge