Merge branch 'cnngimenez-master'
authorMarek Marecki <marekjm@ozro.pw>
Sun, 23 Apr 2017 12:27:38 +0000 (14:27 +0200)
committerMarek Marecki <marekjm@ozro.pw>
Sun, 23 Apr 2017 12:27:38 +0000 (14:27 +0200)
commit72a1545571c58ada85f4c6f2589035a157deea60
treeed9ca9181cad049ac0f734400ed65369ed538f92
parentdead87b635c850eb89d956ea5e85d8735f0850e4
parent1659dc93b383b4cd67e836ca1dadfb192015c284
Merge branch 'cnngimenez-master'