Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 12 Dec 2010 21:59:50 +0000 (22:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 12 Dec 2010 21:59:50 +0000 (22:59 +0100)
commitb8e2ca20a1fb71b2460a0ef97d462cd55e796b02
tree55d22f84d178c66bfb66f0e0500935514b957e62
parentc5685c2420e9a67e6a81e36bbba9f78b5fc268a3
parent0d08de33a65c31386be41132230f9fba9028166c
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x