Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Sep 2013 12:46:45 +0000 (14:46 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Sep 2013 12:46:45 +0000 (14:46 +0200)
commit270c0c0ef03de6b912aeee63d117df6fb64a37e4
tree6f43f32dab3ec193f9ae1f43270b925e84e0856d
parentf2ce8e838fc8dbaeede744d8704240e3ab02036c
parent716ddc41d3eee198a11f6da1d168d9c4226b4f2c
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen