saltstack/salt — pull request #18692 by cvrebert (2014-12-04 00:49:50+00:00)
Title: lxc runner: delete mistakenly committed merge conflict

Was introduced by 200a6ae8100fa063d55aabdab0930ebb0e39b550