]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 749c210 54bb842)
Merge branch 'master' of /srv/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Jan 2010 19:51:28 +0000 (20:51 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Jan 2010 19:51:28 +0000 (20:51 +0100)
Conflicts:

www/info.json
www/news.json
www/pages/static/ancient_download.xml
www/pages/static/cebit.xml
www/pages/static/development.xml
www/pages/static/download.xml
www/pages/static/index.xml
www/pages/static/screenshots.xml


Trivial merge
The website of ipfire.org.