chiark / gitweb /
Merge branch 'master' into newacpi
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 3 Jun 2012 14:20:29 +0000 (15:20 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 3 Jun 2012 14:20:29 +0000 (15:20 +0100)
commit51e3ad42cb6d9114fe2fb6b277adb59179e1f835
tree4d2a3d72ba37a3146e77da84a84ce962c1ae6d77
parentd625cc214a18028db7b4583207c2324626c4e7f4
parenta975125acf5e047ffca0c50a01fb209b908269a2
Merge branch 'master' into newacpi

Conflicts:
.gitignore
cprogs/.gitignore
debian/.gitignore
debian/changelog
debian/changelog