Erik Johnson 01cb1f9576 Revert "Remove merge argument from pillar.get"
This reverts commit f6ba9ddb59ec1feabed6a1b4230612bf7f6d3795.

the nginx.ng formula is only compatible with the upcoming feature
release, as noted here:

https://github.com/saltstack-formulas/nginx-formula#nginxng
2014-07-03 15:40:15 -05:00
..
2014-05-19 13:04:43 -04:00
2014-06-19 11:25:40 -04:00
2014-05-19 13:22:51 -04:00
2014-05-19 13:22:51 -04:00
2014-05-21 01:01:43 -04:00