]> git.ipfire.org Git - ipfire.org.git/commit - www/static/images/flags/af.png
Merge branch 'next'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Jan 2010 16:42:28 +0000 (17:42 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Jan 2010 16:42:28 +0000 (17:42 +0100)
commit8e2af3e7307878108558441af4772be2274c34e8
tree55696672d4eacd98f0af8bfdd5e20aa9a20f8930
parentca718de115e8ed777006f5626db2e58a5db4b6cd
parent0942aa051938cc021e7f6f0e68def852ad48618d
Merge branch 'next'

Conflicts:

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