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
..
__apt_ppa
__apt_update_index
__autofs_map
__autofs_master
__cdistmarker
__cron
__debconf_set_selections
__directory
__file
__group
__issue
__jail
__key_value
__line
__link
__mkfs
__motd
__mysql_database
__package	Merge branch 'master' into 2.1	2012-10-15 15:39:08 +02:00
__package_apt	Merge branch 'master' into 2.1	2012-10-15 15:39:08 +02:00
__package_luarocks	Merge branch 'master' into 2.1	2012-10-15 15:39:08 +02:00
__package_opkg	Merge branch 'master' into 2.1	2012-10-15 15:39:08 +02:00
__package_pacman	Merge branch 'master' into 2.1	2012-10-15 15:39:08 +02:00
__package_pip
__package_pkg_freebsd	Merge branch 'master' into 2.1	2012-10-15 15:39:08 +02:00
__package_pkg_openbsd	Merge branch 'master' into 2.1	2012-10-15 15:39:08 +02:00
__package_rubygem	Merge branch 'master' into 2.1	2012-10-15 15:39:08 +02:00
__package_yum	Merge branch 'master' into 2.1	2012-10-15 15:39:08 +02:00
__package_zypper
__partition_msdos
__partition_msdos_apply
__pf_apply
__pf_ruleset
__postgres_database
__postgres_role
__process
__qemu_img
__rvm
__rvm_gem
__rvm_gemset
__rvm_ruby
__ssh_authorized_key
__start_on_boot
__timezone
__user