Merge branch 'core48'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 29 Mar 2011 14:20:45 +0000 (16:20 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 29 Mar 2011 14:20:45 +0000 (16:20 +0200)
commit7f71b9ed04b29555d493793a7ab25a4f1a530ad1
tree2b525bf37fb9c1b17942d6ce8d1fdcdf51adc4be
parent1151f4d08bf00dee56487968f321a09e0bb36bfe
parent7a524f82b94fa35dab7c1abfbe11865ece156ef5
Merge branch 'core48'