Merge remote-tracking branch 'sans/master'

Conflicts:
	doc/changelog

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-04-29 10:39:52 +02:00
commit 1480cafac5
2 changed files with 2 additions and 3 deletions

View file

@ -5,7 +5,6 @@
* Renamed explorer: hardware_type to machine
* Core: Do not execute empty code fragments
1.6.2: 2011-04-19
* Core: Introduce __cdist_tmp_base_dir
* Core: Cleanup and enhance cdist-type-template