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)
commit04577ee9311f825d4bf84a5f4b15e085c1bdc3f3
tree98a3b8200c075a2db616b22a610548500a8f51d8
parent673f2c7418c02fde9b9651d1887cc0cdf7b5a80f
parent34af066e9e5c075466a27b44952779086a5f56e6
Merge branch 'strato-dep-mx'