Merge pull request #2856 from msekletar/merge-instance
authorDaniel Mack <github@zonque.org>
Thu, 17 Mar 2016 19:24:39 +0000 (20:24 +0100)
committerDaniel Mack <github@zonque.org>
Thu, 17 Mar 2016 19:24:39 +0000 (20:24 +0100)
commit90e644608ebf94f5f3c8acb1317bf4723826e337
tree2de26c4cb4dc7b399e92510df482b87c213c6c01
parent2ddbdcc9c24b802564784f0812611b368a733e51
parent7aad67e7f2b3dfbc3b5a884471bd551e4bf997cc
Merge pull request #2856 from msekletar/merge-instance

core: look for instance when processing template name