From: Michael Wiebusch <stratomaster@gmx.net>
Date: Tue, 27 Aug 2013 11:54:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=e497f5c61fc3eb73adf8c984bd908c6d784c6eca;p=mvd_docu.git

Merge remote-tracking branch 'origin/master'
---

e497f5c61fc3eb73adf8c984bd908c6d784c6eca