Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 07:58:49 +0000 (09:58 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 07:58:49 +0000 (09:58 +0200)
commitecd0ac08a56363fd779bcd08d70a4720f99a33db
treeae38701dc805c7e9a04097f4734d96c1bbeb44d9
parentd8ce16fa6619b9090919ffa334aebdc67418f75c
parent03207e65b1244bb4a82a55bc1e1f893e05695aa0
Merge remote-tracking branch 'origin/next' into thirteen