Commit Graph

1 Commits

Author SHA1 Message Date
SaltyCharles
963dfa6dfc Merge remote-tracking branch 'saltstack/develop' into develop
# Conflicts:
#	salt/cloud/__init__.py
2016-05-27 10:05:13 -07:00