Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Jan 2014 19:31:03 +0000 (20:31 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Jan 2014 19:31:03 +0000 (20:31 +0100)
commit3547adad97669b65c9b11eb69aa36fd41a2484d0
tree09d0e8a6d32397d9743c3bcf1e31c77d86ac93ac
parent986ba0d12789e4a91d3cfb923822e2f366c9070a
parent2a747e37a86f44c5da8dbf67c4135772df29f24e
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen