Merge branch 'master' of linz:/srv/git/slides
authorRobert Kaiser <robert@widebook.box.kairo.at>
Mon, 25 Nov 2013 15:36:34 +0000 (16:36 +0100)
committerRobert Kaiser <robert@widebook.box.kairo.at>
Mon, 25 Nov 2013 15:36:34 +0000 (16:36 +0100)
1  2 
index.html

diff --cc index.html
Simple merge