]> git.ipfire.org Git - ipfire.org.git/commit
Merge branch 'master' of /srv/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Sep 2008 18:53:30 +0000 (20:53 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Sep 2008 18:53:30 +0000 (20:53 +0200)
commitd679a1a44840efc62a5818ad5093184670094796
tree8447bcadc078bf145a3a650e023553b0849acd21
parent165d05663f7b3c22e16a367cf93c691a656c6ed4
parentf8253574457a8d0c9362cdf0bb5deaea8f7679e5
Merge branch 'master' of /srv/git/ipfire.org

Conflicts:

www/en/index.shtml
www/en/news.shtml