chiark / gitweb /
Merge branch 'master' into newacpi
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 6 Jun 2012 00:45:46 +0000 (01:45 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 6 Jun 2012 00:45:46 +0000 (01:45 +0100)
commit5eaaad7328acab8842aa56bc35564926485fb380
tree66ea4ee369048300067f1bb0cd15808e21be8a2d
parent8eec75b2cfd6c1cb8b00815337b07dcadc79c54b
parent773df8155d824fb6387137ff0b8a1f6b81a300de
Merge branch 'master' into newacpi
debian/changelog