Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 Feb 2014 13:38:02 +0000 (14:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 Feb 2014 13:38:02 +0000 (14:38 +0100)
commit178df99a871760cfa773543f3258c04c76fc5d6f
tree1255424f33f4a283e66f4605d35e2b0373be8862
parent4a23c55b0dbf07d4a4449ef1ad637acc076fc67c
parent15b023b97944802aae90982511de103310496c31
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next