Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Dec 2013 16:13:34 +0000 (17:13 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Dec 2013 16:13:34 +0000 (17:13 +0100)
commite39ac92dd298fee0e546638c36f568978398a5f1
tree094e4dccc0bda6c8b0bd28fa921ea84104b1ce97
parentbe33adfb3d958259695d8b8ce2803181fbf78be2
parent50ce309b6ab17dc61648e7d6654117d5e1661cd7
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen