chiark / gitweb /
Merge branch 'kibi'
authorPeter Palfrader <peter@palfrader.org>
Sun, 24 Nov 2013 07:38:17 +0000 (08:38 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 24 Nov 2013 07:38:17 +0000 (08:38 +0100)
commitf7aeb82b5cd23774930fca75e57bf5ba4971ba4a
tree3902f75f49ad2813c50c85520274224891e4e3c2
parentcacce32945fbb67051ee108ceda0861ffd73f26a
parentf5d77b23c2c0dbd478dfacbd05003af6b8ee75e0
Merge branch 'kibi'

* kibi:
  d-i.debian.org: Adjust package list.

Conflicts:
debian/changelog
debian/changelog
debian/control