Merge branch 'master' of https://github.com/zeha/grml-debootstrap
authorMichael Prokop <mika@grml.org>
Thu, 3 Jul 2014 10:16:34 +0000 (12:16 +0200)
committerMichael Prokop <mika@grml.org>
Thu, 3 Jul 2014 10:16:34 +0000 (12:16 +0200)

Trivial merge