tree a86571f2979c855aaea9b71a287e8790b679754a
parent 2c53308a18d929a6e42a040c3bb97c0e0a4c31b1
parent 217343b04d2921045954edd6a701b2a8b4037bb6
author Michael Kutý <6du1ro.n@gmail.com> 1447166393 +0100
committer Michael Kutý <6du1ro.n@gmail.com> 1447166393 +0100

Merge branch 'hotfix/mysql' into master-3