From: Daniel Mack <github@zonque.org>
Date: Thu, 17 Mar 2016 19:24:39 +0000 (+0100)
Subject: Merge pull request #2856 from msekletar/merge-instance
X-Git-Tag: v230~257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90e644608ebf94f5f3c8acb1317bf4723826e337;p=thirdparty%2Fsystemd.git

Merge pull request #2856 from msekletar/merge-instance

core: look for instance when processing template name
---

90e644608ebf94f5f3c8acb1317bf4723826e337