Commit graph

2203 commits

Author SHA1 Message Date
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
Nico Schottelius
392ec3c5ed correct link to __file
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 17:46:19 +02:00
Nico Schottelius
c9f728e073 lib/cdist => cdist (pypi)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 17:21:58 +02:00