projects / mirror / dsa-wiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c30ecb7 8594646)
Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki
authorPeter Palfrader <peter@palfrader.org>
Fri, 28 Aug 2009 20:25:52 +0000 (22:25 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 28 Aug 2009 20:25:52 +0000 (22:25 +0200)
* 'master' of ssh://db.debian.org/git/dsa-wiki:
  No longer need to set editor alternative - puppet does that.  Just make sure vim is installed soon enough

1  2 
input/howto/new-machine.creole patch | diff1 | diff2 | blob | history

diff --cc input/howto/new-machine.creole
Simple merge
Unnamed repository; edit this file 'description' to name the repository.