Merge branch 'master' into 2.9beta1
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Dec 2010 23:32:24 +0000 (00:32 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Dec 2010 23:32:24 +0000 (00:32 +0100)
commit852c45d289fec8d5740a81741c11b26993dbbe6e
treeba4767a9b4d70c56cf29ee7e8f954f52d242aab2
parent68b23cbb0074191a034f24b6b5a4c10221e22254
parent3885956a7f53045b61ad511e107c0338da944865
Merge branch 'master' into 2.9beta1