Merge pull request #247 from shaded-enmity/origin/pullfix
authorLennart Poettering <lennart@poettering.net>
Thu, 18 Jun 2015 11:02:57 +0000 (13:02 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 18 Jun 2015 11:02:57 +0000 (13:02 +0200)
commite063e03404f0d36ffe2de90574e4601461d13517
tree5e84d47d420ca54edc4485d99f89e7bbe5871abe
parentfd23f9c9a70e1214507641d327da40d1688b74d7
parent4764a54439e51cc3d3d0858a94a2d03a352a628c
Merge pull request #247 from shaded-enmity/origin/pullfix

import/pull: fix for the name/reference overwrite