Merge branch 'master' of /srv/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 May 2009 20:02:26 +0000 (22:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 May 2009 20:02:26 +0000 (22:02 +0200)
commitfdd242ac27eb677d77c7429bcd61106a59e36d7e
treed592b5e8af2f6e53871ee6240b983303f209e46b
parentb8c0eb0a3b8adad05c707c64b605e90e76726c65
parent478d167b6cffdde9286305ebf5f826d492d0411d
Merge branch 'master' of /srv/git/ipfire.org
www/web/__init__.py