tree 30ed67721b1634f501d2c73d3520d99854516764
parent 201046154df3750a3ace59a068a267bcb2e635ce
parent 74f02e17ebfa4e61f531201cc850a7037c6d84ac
author Simon Pasquier <spasquier@mirantis.com> 1480003811 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1480003811 +0100

Merge remote-tracking branch 'upstream/master' into stacklight