From: Martin Mares <mj@ucw.cz>
Date: Sat, 30 Jun 2018 22:15:32 +0000 (+0200)
Subject: Merge branch 'ucwmac2'
X-Git-Tag: v1.99~1
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;ds=sidebyside;h=b98fb837ec8d9fe44f2c8f9329ca56a7a3fe6213;p=ucwmac.git

Merge branch 'ucwmac2'
---

b98fb837ec8d9fe44f2c8f9329ca56a7a3fe6213