Dag Wieers 0eca47cf91 Avoid merging a dict and a AnsibleUnicode ... This is the same fix we applied to v1.9 in PR #14565, however it does not fix #14678 completely ! The dictionaries are not being merged as tey are on v1.9.		2016-02-26 15:03:51 +01:00
..
ansible	Avoid merging a dict and a AnsibleUnicode	2016-02-26 15:03:51 +01:00