Revision 86e4ab496761ee50fda3564eb1d20c0ac8f41d77
Committed on 26/08/2014 3:40 pm by
dfritschy <donat@fritschy.ch> [GitHub Diff]
Merge branch 'df2014' of https://github.com/dfritschy/cjw-summercamp-slides into df2014
Conflicts:
presentation-output.html
scripts/md/slides.md
Conflicts:
presentation-output.html
scripts/md/slides.md