Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 9 Jan 2014 11:17:55 +0000 (12:17 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 9 Jan 2014 11:17:55 +0000 (12:17 +0100)
commitdf5a6ef76f2fad5aa08ec2959348f9eed9a48d70
tree89d8f63b7dde9e21ce18b2fc77cd979995b6044e
parent4e36e1791f368d6e612bc70bc5a5d6ffe1692338
parent9b574b13de88735968287db83bf1936087f9e59a
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen