Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Mar 2010 20:46:44 +0000 (21:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Mar 2010 20:46:44 +0000 (21:46 +0100)
commit2f2b526964081aab5872404691c2c3615e45da12
tree6507875a85d25496fc5aa53bfe0f1489b71f5d09
parent0b34d1a225efdf278a72abb9d5a8eaed6bd206df
parent48cd21cdc0bf64193bfe42b4073412d510373868
Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next