Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x
authorDirk Wagner <glotzi@ipfire.org>
Fri, 16 Apr 2010 19:25:00 +0000 (21:25 +0200)
committerDirk Wagner <glotzi@ipfire.org>
Fri, 16 Apr 2010 19:25:00 +0000 (21:25 +0200)
commit1b20d886cb1b4917adde9c1b13bd54bbedd24d2f
tree51b2fc447f3968c69c49591149219dd8b89d6263
parent52c2987084413a06da83dbd5dcb8abf6b66dcfc2
parentfdeaa057c2f60b80890e24885db7b3b81bdd8ff2
Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x