Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 8 Jan 2014 16:20:07 +0000 (17:20 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 8 Jan 2014 16:20:07 +0000 (17:20 +0100)
commit4ed7ef4620637d6047edc4fd713e753d3a7f254e
treedac77437aae125836bf102dbd0ae4436e86258ba
parent010ea13643caa3aac57e7b9829273cb27bf93198
parent96cbae14d7ad23028eea2701210a312003d4b199
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen