]> git.ipfire.org Git - ipfire.org.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Jan 2011 18:27:06 +0000 (19:27 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Jan 2011 18:27:06 +0000 (19:27 +0100)
commitc93793dd03b602f153c3ff51debb028af18bf825
tree9480b3efe73414d1880bfc6bc9855eeeec0bf278
parent9a3ec63cfebd87f93af4b37a8cd29fbb7749f2e0
parentf1f7eb7e0884d1ea245667f90b00712c26dbbed1
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org

Conflicts:
www/webapp/__init__.py