]> git.ipfire.org Git - ipfire.org.git/commit - www/templates/modules/release-item.html
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)
commit3ad218aed739ec830e0d078ae776d195c48b4d86
treeca1428568ecaf28b6d48ce0a1ec32805b2dfa7fb
parent749c2107fc71f35d7abe474a5a4aca0597de7d19
parent54bb8427e65790cd8af7b1550c59dff004fff068
Merge branch 'master' of /srv/git/ipfire.org

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