Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Stefano Stella 2017-03-14 17:04:24 +01:00
commit ce57daaa29

View File

@ -84,6 +84,7 @@ Maxim Burgerhout <maxim@wzzrd.com>
Mickey Malone <mickey.malone@gmail.com>
Michael Steed <msteed@saltstack.com>
Mike Place <mp@saltstack.com>
Mircea Ulinic <mircea@cloudflare.com>
Mitch Anderson <mitch@metauser.net>
Mostafa Hussein <mostafa.hussein91@gmail.com>
Nathaniel Whiteinge <seth@eseth.com>