You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Nico Schottelius 684ad56a80 Merge branch 'master' into notifications ... Took the __file parts from master. Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> Conflicts: cdist/conf/type/__file/gencode-local cdist/conf/type/__file/gencode-remote		11 years ago
..
dev	add another log for notifications	11 years ago
gfx	…
man	add more exapmles to cdist-manifest	11 years ago
speeches	add final version of presentation + pdf variant	11 years ago
video	…
web	…
changelog	2.3.7 release	11 years ago
changelog.future	…