* stable-2.13
  (no changes)

* stable-2.12
  Expand orphan volume test
  Restrict Ganeti's orphan volume checks to the single VG
  Modify UDS server startup to set permissions for sockets
  Add wheezy chroot files to gitignore file
  Makefile.am: Don't use -dynamic-too for .hpc_o files
  Makefile.am: Don't use dots in -osuf
  Fix compiler invocation for GHC >= 7.8
  Makefile.am: Fix wrong -dep-suffix for GHC 7.8
  Only upgrade configs not upgraded
  Only unlock config if we did lock it
  Mention preferred DRBD module settings when using Xen
  Avoid assertIn
  Test presence of public and private parameters
  Put private parameters into the environment
  Always close pipe on job forking
  Clean up pipes early on failed forks

Conflicts:
	.gitignore
	Makefile.am
	lib/config/__init__.py
	src/Ganeti/WConfd/Server.hs
	test/py/cmdlib/cluster_unittest.py

Resolution:
        .gitignore: Join additions
        Makefile.am: Use Niklas' changes
        __init__.py: Take the 2.14 version, incorporating cherry-picked
                     fix already
        Server.hs: Take 2.13 imports
        cluster_unittest.py: Take 2.13 change with changed import

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>