Merge branch 'devel'
authorMarek Marecki <marekjm@ozro.pw>
Sun, 23 Apr 2017 12:28:22 +0000 (14:28 +0200)
committerMarek Marecki <marekjm@ozro.pw>
Sun, 23 Apr 2017 12:28:22 +0000 (14:28 +0200)
commit888b34d32cb2327c6640cca8d231d29db1a5ffc1
tree81a9002195406c5cd2b5bcfe6c493a89c9acc7f0
parent72a1545571c58ada85f4c6f2589035a157deea60
parent4be5b22c9ef086f8c647d3a95303df38495888c8
Merge branch 'devel'