Merge branch 'master' into feature_files_export

2014-04-12 20:05:57 +02:00 · 2014-04-12 20:05:57 +02:00 · 3c9f021e2a
parent 2eab8d49af 702a07b2d1
commit 3c9f021e2a
1 changed files with 1 additions and 1 deletions
--- a/docs/changelog
+++ b/docs/changelog
@ -5,7 +5,7 @@ Changelog
 	* Exception: No braces means author == Nico Schottelius


-3.1.2:
+3.1.2: 2014-04-12
 	* Documentation: Add missing environment variables to reference
 	* Type __qemu_img: size is optional, if state is not present
 	* Type __key_value: Rewrite using awk (Daniel Heule)