McCouman/PIS-draft — pull request #2 by SimonWaldherr (2013-09-14 10:15:42+00:00)
Title: update

Merge branch 'master' of https://github.com/McCouman/PIS-draft

Conflicts:
beispieldateien/base.json
beispieldateien/meta.json
logodrafts/1.png
logodrafts/2.png
logodrafts/d01.png
logodrafts/d02.png
logodrafts/drop your logos here
mails/einladung-1st-pis-conf-2.md
mails/terminbestaetigung-1st-pis-conf.md
website-draft/de/contribute.md
website-draft/de/orga.md
website-draft/de/press.md
website-draft/de/team.md
website-draft/de/technology.md
website-draft/design/index.html
website-draft/design/style.css