]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Merge commit 'v0.9.12.1' into v0.9.12-maint
authorEric Blake <eblake@redhat.com>
Fri, 4 Oct 2013 12:28:49 +0000 (06:28 -0600)
committerEric Blake <eblake@redhat.com>
Fri, 4 Oct 2013 12:31:59 +0000 (06:31 -0600)
Done by 'git merge -s ours v0.9.12.1', so that the maint branch
will contain all release tags.

Signed-off-by: Eric Blake <eblake@redhat.com>

Trivial merge