Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Feb 2014 12:38:25 +0000 (13:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Feb 2014 12:38:25 +0000 (13:38 +0100)
commit2cce1559f2da9b986a4288159478b1b999710457
treef6f80fd0f454d0a138759c47a3d801d80609193f
parentc0e8224d1c176a1df13db0a2a506c9cdea4058a8
parentb8101c50ea58cc6a6bc76fe472826af7b7f33271
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next