]> git.ipfire.org Git - people/jschlag/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/next' into libvirt libvirt
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Sun, 20 Mar 2016 10:47:56 +0000 (11:47 +0100)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Sun, 20 Mar 2016 10:47:56 +0000 (11:47 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge