tree e53160f680bff4055cc1058f4df4ed31724c191b
parent 89c8c3fc5b4785f84f0d6ce1c66174f324f583ce
parent 3dc81cfe7899f2a8ac327718b568085f280fa2de
author Petr Michalec <epcim@apealive.net> 1498652791 +0200
committer GitHub <noreply@github.com> 1498652791 +0200

Merge branch 'master' into pr/27