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		2013-12-03 14:38:11 +01:00
..
dev	add another log for notifications	2013-11-26 00:25:00 +01:00
gfx	add logo that is used on cdist flyers	2013-05-15 09:28:41 +02:00
man	add more exapmles to cdist-manifest	2013-10-10 09:51:26 +09:00
speeches	add final version of presentation + pdf variant	2013-11-22 20:57:16 +01:00
video	doc -> docs (pypi)	2012-10-25 17:17:52 +02:00
web	add hint for 2.2 to 2.3 migration	2013-08-12 12:42:26 +02:00
changelog	2.3.7 release	2013-12-02 15:16:31 +01:00
changelog.future	changelog updates	2013-08-08 19:09:53 +02:00