From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 13 Sep 2018 13:43:00 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.3.2^2~46
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=656d9772785c269e10e48df60f38b77ad16cc022;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'master' into develop

Conflicts:
	lib/cr_vmware_tpl/handler.py
---

656d9772785c269e10e48df60f38b77ad16cc022
diff --cc lib/cr_vmware_tpl/handler.py
index c887d2f,5cb2033..23b7d04
--- a/lib/cr_vmware_tpl/handler.py
+++ b/lib/cr_vmware_tpl/handler.py
@@@ -36,7 -36,7 +36,8 @@@ from .obj import PpBaseObjec
  
  from .config import CrTplConfiguration
  
- __version__ = '0.9.3'
 -__version__ = '0.9.2.1'
++__version__ = '0.9.4'
++
  LOG = logging.getLogger(__name__)
  TZ = pytz.timezone('Europe/Berlin')