From: Dominic Radermacher <blip@mockmoon-cybernetics.ch>
Date: Sat, 24 Jun 2017 08:45:59 +0000 (+0200)
Subject: Merge branch 'devel'
X-Git-Tag: v1.3.4~6
X-Git-Url: https://git.sur5r.net/?p=ptouch-print;a=commitdiff_plain;h=d76c7a16c7d85c706cd08c605ce7766640bc772a

Merge branch 'devel'

Accidently pushed branch devel to github instead to my private git server
---

d76c7a16c7d85c706cd08c605ce7766640bc772a