Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Jan 2010 11:11:34 +0000 (12:11 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Jan 2010 11:11:34 +0000 (12:11 +0100)
commit3c68549f8c8f5246be8c403557b0505f634b7516
tree14ab70fe6fbb2ecb723155887bd30755744d99fd
parent449749f1ef56fa7eb147f4637e867c6e076f21d7
parent9a6cf20c3d185435c674c9431ffeaf02b5ed7974
Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x