saltstack/salt — pull request #18467 by rallytime (2014-11-25 04:07:18+00:00)
Title: Remove encoding kwarg from ustring

Fixes #18458
Refs #18374