Merge branch 'master' into preos

This commit is contained in:
Nico Schottelius 2013-12-01 18:42:49 +01:00
commit e58a467327
3 changed files with 10 additions and 4 deletions

View file

@ -9,6 +9,7 @@ Changelog
* Type __file: Only remove file when state is absent (Steven Armstrong)
* Type __link: Only remove link when state is absent (Steven Armstrong)
* Type __directory: Only remove directory when state is absent (Steven Armstrong)
* Core: Fix backtrace when cache cannot be deleted
2.3.6: 2013-11-25
* New Type: __locale