Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-05' into queue...
commit6a5c357fdbd4c91c5142f1b7ccf4658664b52ea2
authorKevin Wolf <kwolf@redhat.com>
Tue, 5 Apr 2016 15:31:20 +0000 (5 17:31 +0200)
committerKevin Wolf <kwolf@redhat.com>
Tue, 5 Apr 2016 15:31:20 +0000 (5 17:31 +0200)
treed16c0871122bf07bb6bce744b037c3350aa23f38
parent76b223200ef4fb09dd87f0e213159795eb68e7a5
parent95c3df5a24e2f18129b58691c2ebaf0d86808525
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-05' into queue-block

Block patches for the 2.6 release

# gpg: Signature made Tue Apr  5 17:23:48 2016 CEST using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"

* mreitz/tags/pull-block-for-kevin-2016-04-05:
  crypto: Avoid memory leak on failure
  qemu-iotests: 149: Use "/usr/bin/env python"

Signed-off-by: Kevin Wolf <kwolf@redhat.com>