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 21:39:15 +0000 (22:39 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Jan 2014 21:39:15 +0000 (22:39 +0100)
commit33c56b4f5853524a2c8dabc4d36ff602d6bf6314
tree019597e64f2a6035e57b239082480ee31a9bda3d
parent918bacacbd707105f0c49f5fa0917d011bde0a7f
parent2106b71eb555e29ff85d9bab0d1312642b730f59
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen