From 7439353031b99d54a0456d01b9ea353d1e96541c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sun, 4 Mar 2018 03:54:39 +0100
Subject: [PATCH] version 4.0.15

---
 debian/changelog | 33 +++++++++++++++++++++++++++++++++
 version          |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 926b710..e10c77f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+qubes-core-admin-client (4.0.15-1) unstable; urgency=medium
+
+  [ Marek Marczykowski-Górecki ]
+  * doc: add 'pci-e820-host' feature description
+
+  [ Rusty Bird ]
+  * qvm-backup-restore: remove orphaned --replace-template option
+  * qvm-backup-restore: really pass options
+  * qvm-backup: let backup core handle default VM selection
+  * restore.py: don't try to restore dispid property
+  * restore.py: sort into three tiers in _templates_first()
+  * restore.py: deal with DispVM templates
+  * restore.py: factor out _restore_property() helper
+  * restory.py: restore template_for_dispvms property early
+  * restore.py: add template-related debug log messages
+
+  [ Frédéric Pierret ]
+  * Add support for python34-sphinx: package is provided in Qubes
+    repository
+
+  [ Marek Marczykowski-Górecki ]
+  * tools: terminate qvm-start-gui when X server is terminated
+
+  [ Rusty Bird ]
+  * qvm-backup-restore: also handle absent --ignore-missing
+
+  [ Marek Marczykowski-Górecki ]
+  * qvm-template-postprocess: call fstrim after removing image file
+  * tools/qvm-prefs: fix printing None value
+  * tests: add tests for various 'qvm-prefs vm pref' cases
+
+ -- Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>  Sun, 04 Mar 2018 03:54:39 +0100
+
 qubes-core-admin-client (4.0.14-1) unstable; urgency=medium
 
   [ Marek Marczykowski-Górecki ]
diff --git a/version b/version
index 80c4caf..af253c1 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-4.0.14
+4.0.15