From: Stefan Strohauer <sstrohauer@jspc31.x-matter.uni-frankfurt.de>
Date: Thu, 29 Aug 2013 11:30:19 +0000 (+0200)
Subject: Merge branch 'master' of jspc29:radhard
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7a8bcf2981d20ca3369b4a9bbcadb39d7a899fe3;p=radhard.git

Merge branch 'master' of jspc29:radhard
Merged with Bennys changes.
---

7a8bcf2981d20ca3369b4a9bbcadb39d7a899fe3