From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 25 Nov 2013 15:40:13 +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=f436491483ce4062f062d52c709c73925379467c;ds=sidebyside

Merge branch 'master' of linz:/srv/git/slides
---

f436491483ce4062f062d52c709c73925379467c