]> git.sur5r.net Git - ptouch-print/commitdiff
Merge branch 'devel'
authorDominic Radermacher <blip@mockmoon-cybernetics.ch>
Sat, 24 Jun 2017 08:45:59 +0000 (10:45 +0200)
committerDominic Radermacher <blip@mockmoon-cybernetics.ch>
Sat, 24 Jun 2017 08:45:59 +0000 (10:45 +0200)
Accidently pushed branch devel to github instead to my private git server


Trivial merge