From: Roland Hieber <rohieb@rohieb.name>
Date: Thu, 16 Jan 2014 23:11:12 +0000 (+0100)
Subject: Merge branch 'presentation'
X-Git-Url: https://git.rohieb.name/skm-ma-ws1314.git/commitdiff_plain/48f414cd2758feacf54935385c7c2813463d7b6f?ds=sidebyside

Merge branch 'presentation'
---

48f414cd2758feacf54935385c7c2813463d7b6f