From: Robert Kaiser Date: Mon, 25 Nov 2013 15:36:34 +0000 (+0100) Subject: Merge branch 'master' of linz:/srv/git/slides X-Git-Url: https://git-public.kairo.at/?p=slides.git;a=commitdiff_plain;h=3046b5bf4f204dac735647dd492c95e8368c312b Merge branch 'master' of linz:/srv/git/slides --- 3046b5bf4f204dac735647dd492c95e8368c312b