Nico Schottelius 9b809ce9a2 Merge branch 'git-version' of https://github.com/evax/cdist ... Conflicts: lib/cdist/__init__.py Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>		2012-05-22 15:35:11 +02:00
..
cdist	Merge branch 'git-version' of https://github.com/evax/cdist	2012-05-22 15:35:11 +02:00