Merge branch 'master' of ../../save/merge/frio_hovercard into frio
authorrabuzarus <rabuzarus@t-online.de>
Wed, 25 May 2016 09:18:27 +0000 (11:18 +0200)
committerrabuzarus <rabuzarus@t-online.de>
Wed, 25 May 2016 09:18:27 +0000 (11:18 +0200)

Trivial merge