Merge branch 'master' of ralfj.de:saartuer
authorConstantin Berhard <constantin@exxxtremesys.lu>
Sun, 27 Oct 2013 16:05:28 +0000 (17:05 +0100)
committerConstantin Berhard <constantin@exxxtremesys.lu>
Sun, 27 Oct 2013 16:05:28 +0000 (17:05 +0100)

Trivial merge