Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 4 Jul 2011 19:05:46 +0000 (21:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 4 Jul 2011 19:05:46 +0000 (21:05 +0200)
commit7180ae3897fecf7366f1e465f90048cd8174ca78
tree58f069c6b468f8a025dfee07253008b4522a23b9
parente8bae96337cc79c86388f805bfc637d67cd0c362
parent4912df2ff60c3bf0d8dff3093bac58c892801c6b
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next