Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorroot <root@Averatec.(none)>
Mon, 5 Jan 2009 18:30:39 +0000 (19:30 +0100)
committerroot <root@Averatec.(none)>
Mon, 5 Jan 2009 18:30:39 +0000 (19:30 +0100)
commit18680014062bb8e975258eb74c9f19aa9c478bd6
tree8d9882afda0eae3651aca327527ce9ef22eaa88c
parent5b5d45775bf147a5729b3dcc5f98a12646c75031
parent5bc3883c7a5481a7c0bee32fd81413b3f1c9b630
Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x