Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Feb 2014 10:56:52 +0000 (11:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Feb 2014 10:56:52 +0000 (11:56 +0100)
commit582fa1555574ac0b6abc0a4daee906d1a9a091ef
treed6ceb21847f6ac833b74e49ef9272852dbebd5fd
parent27b2adbf4f962fce13d5f66bc55dae2c86aeb685
parentfffb777ee6f9c62f29966677045a6bdc705aece0
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next