Steven Armstrong b9b90dad36 merge from upstream ... Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>		2011-04-04 13:18:04 +02:00
..
man1	remove second author, asciidoc/docbook cant handle it	2011-03-29 23:57:37 +02:00
man7	add example multi branch .git/config	2011-04-04 12:04:10 +02:00
cdist-reference.text.sh	remove double information from reference	2011-04-02 03:36:41 +02:00