Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 23 Dec 2013 21:27:58 +0000 (22:27 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 23 Dec 2013 21:27:58 +0000 (22:27 +0100)
commitdcbb8e4f41d6541663ae64f00a05b66e5e01f7cc
tree618f404d6725692a1842be93f6982a145bb7e0e0
parent30f68903d339fdb2e1a0b3ff62b6b770fee9ca36
parent0dc552342b48c1737f20e4a591b21b9812f0c624
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen