Merge branch 'debian'
authorEvgeni Golov <evgeni@debian.org>
Fri, 26 Jun 2015 05:49:43 +0000 (07:49 +0200)
committerEvgeni Golov <evgeni@debian.org>
Fri, 26 Jun 2015 05:49:43 +0000 (07:49 +0200)
commit0ed42c4a3a98e506a5e8e8a6d40b632e572fa0b5
tree9baac95efdbd4ab0ef79572e070d3e8eb0b9fae8
parent17381f923755faece25b43771545c5fa8cedcefc
parenta09ea36d4fde0e56cd34a27716c25395ae41b116
Merge branch 'debian'

Conflicts:
debian/control
debian/changelog
debian/control
debian/live-boot-grml.bug-script