* stable-2.13
  Add a test verifying --ignore-soft-errors in hail
  Pass on options in nodeEvacInstance for ChangePrimary
  HTools: Pass --ignore-soft-errors all the way through
  Make tags a soft error
  Mention tags in --restricted-migration man page entry
  Ignore spurious pylint warnings
  Fix output in case of ExtStorage attach error
  Fix gnt-storage diagnose in case of missing files
  Revision bump to 2.13.0~beta1
  Prepare the NEWS file for 2.13.0~beta1
  Update the rst files for 2.13
  Add a note about downgrades wrt to SSH key handling
  Add check for >1 disk used with the LXC hypervisor
  Update years in copyright disclaimer for LXC files
  Use DSA SSH keys only

* stable-2.12
  Revision bump to 2.12.1
  Prepare the NEWS file for the new 2.12.1 release

Conflicts:
	NEWS
	src/Ganeti/HTools/Cluster.hs
	src/Ganeti/HTools/Node.hs
	src/Ganeti/HTools/Program/Hspace.hs
	test/hs/Test/Ganeti/HTools/Backend/Text.hs

Resolution:
	NEWS: take all additions; Rest: give
	preference to stable-2.14 version

Semantic Conflict:
	Ignore suffix bump in configure.ac

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Aaron Karper <akarper@google.com>