]> git.ipfire.org Git - ipfire.org.git/commit
Merge branch 'master' of /srv/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Oct 2008 16:22:06 +0000 (18:22 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Oct 2008 16:22:06 +0000 (18:22 +0200)
commit54e70d9c5213195b936d2fa7f93bf3dfa0173f3a
tree7565fb2728425c850e74fd72fcbfe3fff34cf32a
parente1f5c9a91937d6cf64500415e1c5efeb2a08a354
parented71cc89d05419aa51f357e12101a2e1266cafb6
Merge branch 'master' of /srv/git/ipfire.org

Conflicts:

www/de/downloads.shtml
www/en/downloads.shtml

nothing added to commit but untracked files present (use "git add" to track)