tree 1ea5935ba35fe6d0f3b9c3134a7d9b6413317cfa
parent b3bd68ed8f3837f9a45a5e4b049e41f3b5867406
parent a081366dadeeefe385897b845dade73c2d435e11
author Piotr Krysik <ptrkrysik@gmail.com> 1519739178 +0100
committer Piotr Krysik <ptrkrysik@gmail.com> 1519739178 +0100

Merge remote-tracking branch 'origin/quick-hack' into grgsm_on_win