Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x
authorDirk Wagner <glotzi@ipfire.org>
Sat, 10 Jul 2010 10:41:05 +0000 (12:41 +0200)
committerDirk Wagner <glotzi@ipfire.org>
Sat, 10 Jul 2010 10:41:05 +0000 (12:41 +0200)
commitf077bfc85b3471297971520158b2833911c958aa
tree90bf39d8d1c892fb401781c8c24d17ca3c57cd1f
parentd2510bc8239277ef5e3a00ae43f8f7cc57bcd6ac
parentd94eba7823fed296433722595e5de70175d8eb03
Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x