Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Apr 2015 11:07:30 +0000 (13:07 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Apr 2015 11:07:30 +0000 (13:07 +0200)
commit334620ee2bf24a4d80303b766f91bc64178c4042
tree602f37cca29a68a8089133e1fe9c941e3d226887
parentdb1078ff114c1cd6b8818848660ee72848874836
parent0fa8d28e8fe5f6a9a04b8d13b4dc6bb6b1f54c8f
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next