From: Michael Tremer Date: Fri, 29 Jan 2010 19:51:28 +0000 (+0100) Subject: Merge branch 'master' of /srv/git/ipfire.org X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ad218aed739ec830e0d078ae776d195c48b4d86;p=ipfire.org.git 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 --- 3ad218aed739ec830e0d078ae776d195c48b4d86