Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Sep 2013 14:12:15 +0000 (16:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Sep 2013 14:12:15 +0000 (16:12 +0200)
commitec9f81be0cee42529ac57c4f106144dfc1a934ec
tree420ecfdfad6abd64e86aa4baeebd712d0577c1af
parent90e4ec2a88ac967600b8c692f7001314ca6d14c3
parent0a379f8fe60459b0d1234fe724c1af802beffbb3
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen