Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 4 Oct 2013 12:53:03 +0000 (14:53 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 4 Oct 2013 12:53:03 +0000 (14:53 +0200)
commit4598f16cfddf949149f4b00f554d8991a192a84f
treee432ae47dfd64633ac9fab9ab4c9e1d3a9b67123
parent08facb3b223363379e0077989cc44fe85a6e1552
parent5ae3072a47b8c2296d3b6bd25516284bf97b3cdc
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen