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)
commitf436491483ce4062f062d52c709c73925379467c
tree3640243560d1272ca18565867abce74a07cab130
parent3d699f2a2ea28fbf921612953aea00acb744ad4a
parent3046b5bf4f204dac735647dd492c95e8368c312b
Merge branch 'master' of linz:/srv/git/slides
index.html