Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 16 Jul 2013 06:36:54 +0000 (08:36 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 16 Jul 2013 06:36:54 +0000 (08:36 +0200)
commit15f78770b1d4ee730dca39166590393e3b24a666
treeaf8b35af8324f60017117291c944fcd13bda73e5
parent2dd319f5b52848a2feee817d62c590106817435b
parent920cc7233335608630a117183b24ee0d5ff2a908
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next