saltstack/salt — pull request #19088 by terminalmage (2014-12-18 15:16:33+00:00)
Title: Fix regression in lxc.update_lxc_conf

This regression snuck in after the 2014.7.0 release, in d447cead. Fixing this
ahead of the 2014.7.1 release.