Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 14 Oct 2010 06:29:18 +0000 (08:29 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 14 Oct 2010 06:29:18 +0000 (08:29 +0200)
commita4aae93d9616aff917de21317a917246f9417b07
treea7dc083ae58232c1223005157f2a2bab6ca66497
parente21bd39e1271891eb3105e980c85bdd72306ccbd
parent528f824cfbb0e8bed7e56e9ebf4d2624ac27eefc
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

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