Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x
authorPeter Pfeiffer <peterman@ipfire.org>
Fri, 22 May 2009 17:52:41 +0000 (19:52 +0200)
committerPeter Pfeiffer <peterman@ipfire.org>
Fri, 22 May 2009 17:52:41 +0000 (19:52 +0200)
commit53bd94654892c7bad524625a6a426e694c7caeb0
treeb8d8d2febbb4b3b7d709f58e1394b3e14a77f65f
parente5520559ae02f26a90eca31fdcabb2b5502981a1
parent4cdac3e52dca4190a16e3d8b78bc18595be1e4d2
Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x