cdist-backup/cdist
Nico Schottelius 5d319027d0 Merge branch 'master' into 2.1_pypi_integration
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

Conflicts:
	.gitignore
	build
2012-10-25 22:35:20 +02:00
..
core lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00
exec lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00
test correct link to __file 2012-10-25 17:46:19 +02:00
util lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00
__init__.py Merge branch 'master' into 2.1_pypi_integration 2012-10-25 22:35:20 +02:00
banner.py lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00
config.py lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00
config_install.py lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00
context.py lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00
emulator.py lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00
install.py lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00
resolver.py lib/cdist => cdist (pypi) 2012-10-25 17:21:58 +02:00