Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 29 May 2009 21:17:57 +0000 (23:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 29 May 2009 21:17:57 +0000 (23:17 +0200)
commit964d21950ab52903611c4bcac4936e822e3318b8
tree70763377bd5ad5ccc0e60512f8ebf90db4ce0c06
parentc485b9022614268d59b70db9db2b8cf3bcb3fe79
parent66cad896054ec11102631fdca4446c3a8e7857d2
Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x