Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 17 Mar 2011 22:15:58 +0000 (23:15 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 17 Mar 2011 22:15:58 +0000 (23:15 +0100)
commitf8cb197ae628ee39b3a82e433b396b40957fe8f9
tree3f1164c8d30bd42ee97295cd7eff73bd69de1257
parent42f5f4297c9769c7c5caeef886f3d1f5700bee71
parent00dd3be110be88eb0fb432a2c2593835fd7bfde7
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  spacing
  upgrade updates
  duplicate line
  further improvments to squeeze procedure
  further improvments to squeeze procedure
  reorder and fix

Conflicts:
input/howto/upgrade-to-squeeze.mdwn
input/howto/upgrade-to-squeeze.mdwn