cdist/conf/type/__package_rubygem
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
..
explorer __package_rubygem 2011-08-17 09:21:07 -04:00
parameter Fix __package* state usage 2012-10-07 11:51:15 -04:00
gencode-remote Merge branch 'master' into 2.1 2012-10-15 15:39:08 +02:00
man.text Merge branch 'master' into 2.1 2012-10-15 15:39:08 +02:00