Merge branch 'master' into core61 v2.11-core61
authorArne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Sun, 22 Jul 2012 08:30:29 +0000 (10:30 +0200)
committerArne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Sun, 22 Jul 2012 08:30:29 +0000 (10:30 +0200)
commit5fc15be081a86a83356cd1ba97f22361468b5e5f
tree0af94b08bb8f5210a8d2eb270fee80dffbe8c080
parent619f637be745adc17928e8ec03972f92a1d58a03
parentcd025baaceeabdd1fd50af0476dfedacb8f60ce6
Merge branch 'master' into core61