Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Jan 2014 14:01:10 +0000 (15:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Jan 2014 14:01:10 +0000 (15:01 +0100)
commitefca40b5cc923da6fc169d3bb2eaa2f39708330b
tree7f0f2d0918184325050eaa931ee807c5814f6caa
parente602416f94ba818557644647bb6f55503e33ccf1
parent31d488a4f688903fd27269a18bdb84d53e9ef6d6
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen