]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Merge branch 'qemu' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 May 2010 12:12:10 +0000 (14:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 2 May 2010 12:12:10 +0000 (14:12 +0200)
1  2 
pkgs/core/qemu/qemu.nm

Simple merge