Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 11 Mar 2010 16:05:17 +0000 (17:05 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 11 Mar 2010 16:05:17 +0000 (17:05 +0100)
commit88a23b423d2d987e987b502c866d9bac56accd55
treeeb43b5d63f79e4165bb20d43883500a21e47bb50
parentffd87fbafcd0997e7bcebabe80da2ee33294d953
parent98af27fdb1ac3a29e387ec1c796f53963febfd9b
Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next