]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
Merge branch 'master' into openswan
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Oct 2008 22:55:11 +0000 (00:55 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Oct 2008 22:55:11 +0000 (00:55 +0200)
commit76cde2851ef696455dbc496ed351320404061f11
tree79ce069f3ccae453dcb02728402df09a59695723
parentb41d997f8b02b3cbb445eb8d727b010932012961
parent2219b263ebefb8af61b9100f220b4c7af2eec2a5
Merge branch 'master' into openswan

Conflicts:
make.sh
doc/packages-list.txt
make.sh