Nico Schottelius 410e0ba8fa Merge branch 'master' into 2.1 ... Conflicts: conf/type/__package/man.text conf/type/__package_apt/man.text conf/type/__package_luarocks/gencode-remote conf/type/__package_luarocks/man.text conf/type/__package_pacman/gencode-remote conf/type/__package_pacman/man.text conf/type/__package_pkg_openbsd/gencode-remote conf/type/__package_pkg_openbsd/man.text conf/type/__package_rubygem/gencode-remote conf/type/__package_rubygem/man.text conf/type/__package_yum/gencode-remote conf/type/__package_yum/man.text Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>		2012-10-15 15:39:08 +02:00
..
dev	+old bug	2012-09-20 17:48:54 +02:00
gfx	document font used for cdist logo	2012-10-08 17:24:13 +02:00
man	Remove __self variable	2012-09-21 20:25:37 +02:00
speeches	import speech from cosin	2011-07-26 17:28:47 +02:00
video	add a video showing a cdist installation in less than 60 seconds	2011-04-19 23:47:26 +02:00
changelog	++changes(2.0.15) - Fixes #66	2012-10-02 18:11:16 +02:00
changelog-2.1	Remove __self variable	2012-09-21 20:25:37 +02:00