Merge branch 'strato-dep-mx'
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 4 Mar 2015 19:40:25 +0000 (20:40 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 4 Mar 2015 19:40:25 +0000 (20:40 +0100)

Trivial merge