chiark / gitweb /
Merge remote branch 'pkern/master'
authorPeter Palfrader <peter@palfrader.org>
Tue, 9 Aug 2011 08:02:44 +0000 (10:02 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 9 Aug 2011 08:02:44 +0000 (10:02 +0200)
commit063366f2e024d0f0a0731744e5a0d76adf6cfed8
tree4cb3f28c2de2c02820f010c1eeb3129438862817
parent60af18e212a6433302506b00964fd10d12b0ad94
parented4e316799239667253fbbb626e0020c93019329
Merge remote branch 'pkern/master'

* pkern/master:
  release.debian.org: drop clasp, add openjdk-6-jre-headless