Merge remote-tracking branch 'grml/master'
authorEvgeni Golov <evgeni@grml.org>
Wed, 10 Dec 2014 11:39:52 +0000 (12:39 +0100)
committerEvgeni Golov <evgeni@grml.org>
Wed, 10 Dec 2014 11:39:52 +0000 (12:39 +0100)
commit17381f923755faece25b43771545c5fa8cedcefc
tree1106efbd078fd657cb90fa137eb469f2bb4924e5
parent3a7cc5f5a9a0306b7fecd71acd4fe2ec340df26e
parent4f7d464214a2e4f0fb9c02d471c78c777e71e807
Merge remote-tracking branch 'grml/master'

Conflicts:
debian/changelog
debian/changelog