]> git.siccegge.de Git - talk/oop.git/commitdiff
Merge git.siccegge.de:talk/template/privat
authorChristoph Egger <christoph@christoph-egger.org>
Sun, 28 Aug 2016 13:40:16 +0000 (15:40 +0200)
committerChristoph Egger <christoph@christoph-egger.org>
Sun, 28 Aug 2016 13:40:16 +0000 (15:40 +0200)

Trivial merge