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

diff --cc index.html
Simple merge