cdist-backup/docs
Nico Schottelius 9eef95a0b6 Merge branch '2.1'
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

Conflicts:
	docs/changelog
2012-11-02 15:59:32 +01:00
..
dev rought migration document 2012-11-02 14:25:55 +01:00
gfx doc -> docs (pypi) 2012-10-25 17:17:52 +02:00
man fix asciidoc title issues (made box out of it) 2012-10-31 09:35:08 +01:00
speeches doc -> docs (pypi) 2012-10-25 17:17:52 +02:00
video doc -> docs (pypi) 2012-10-25 17:17:52 +02:00
changelog Merge branch '2.1' 2012-11-02 15:59:32 +01:00