Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 13 Nov 2012 17:29:13 +0000 (18:29 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 13 Nov 2012 17:29:13 +0000 (18:29 +0100)

Trivial merge