From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 7 May 2009 21:46:14 +0000 (+0200)
Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=7c590a9bc63e8cea2e0a5788bac01035f97f634e

Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki

* 'master' of ssh://db.debian.org/git/dsa-wiki:
  fix spelling mistake
  add it to the index page
  I'm not sure there's anything else I can do to rescue this :)
  add some documentation about iscsi and adding volumes
  A few more pointers
  Move new 5 hosts bugs setup to historical
  new mail stuff seems to be dead or at least hibernating for now
  we should be looking for a new ftp-master and backup.d.o this year or next
  move hardware wishlist from markdown to creole
---

7c590a9bc63e8cea2e0a5788bac01035f97f634e