]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a3ec63 f1f7eb7)
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)
Conflicts:
www/webapp/__init__.py


Trivial merge
The website of ipfire.org.