Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Dec 2011 15:30:21 +0000 (16:30 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Dec 2011 15:30:21 +0000 (16:30 +0100)
commitf530902b81da9c6d275d7ed2d40341371e1a389e
tree5fc1b4d1ae68a3b360586ae43eb31dba130c2625
parent6f5ef200b352a96e9ed7b45a1e64119067c0c98f
parentc01c550df8a24dc1591441a6e9c005d2c9261b94
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next