Nico Schottelius 84eb05aed6 Merge branch 'master' into preos ... Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> Conflicts: docs/changelog		2013-12-04 14:44:54 +01:00
..
dev	Merge branch 'master' into preos	2013-12-04 14:44:54 +01:00
gfx
man	document messaging	2013-12-04 14:19:23 +01:00
speeches	add final version of presentation + pdf variant	2013-11-22 20:57:16 +01:00
video
web	add hint for 2.2 to 2.3 migration	2013-08-12 12:42:26 +02:00
changelog	add changes from preos	2013-12-04 14:44:27 +01:00
changelog.future	changelog updates	2013-08-08 19:09:53 +02:00