tree d20899f6494263e092994177a83836042610b38a
parent 0945541b6be95f1705ae4db781d37931b2a3308c
parent 30bb48cbe5e114af3f1bc014db1aac3810b6c07d
author Carlos Frias <carlos.frias.01@gmail.com> 1504125092 -0400
committer Carlos Frias <carlos.frias.01@gmail.com> 1504125092 -0400

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tasks/main.yml
#	tasks/with_no_proxy.yml
#	tasks/with_proxy.yml