* stable-2.12
  Update design doc with solution for Issue 1094
  Prevent multiple communication nics for one instance
  Remove outdated reference to ganeti-masterd
  Update ganeti-luxid man page
  Add a man page for ganeti-wconfd
  Make htools tolerate missing "dtotal" and "dfree" on luxi
  Get QuickCheck 2.7 compatibility
  TestCommon: Fix QuickCheck import warnings
  Full QuickCheck 2.7 compatibility
  Add a CPP macro for checking the version of QuickCheck
  QuickCheck 2.7 compatibility

* stable-2.11
  Downgrade log-message for rereading job
  Dowgrade log-level for successful requests

Conflicts:
	test/hs/Test/Ganeti/TestCommon.hs
Resolution:
	test/hs/Test/Ganeti/TestCommon.hs: keep additions from both
          versions

Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>