Skip to content
Snippets Groups Projects
Commit c668ead9 authored by Guido Trotter's avatar Guido Trotter
Browse files

Merge branch 'devel-2.5' 


* devel-2.5:
  KVM: support version reported by 1.0
  doc/admin: Clarify archived jobs

Conflicts:
	NEWS: trivial

Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 2ce40421 c52d91e6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment