tree 30ed67721b1634f501d2c73d3520d99854516764
parent 201046154df3750a3ace59a068a267bcb2e635ce
parent 83bdd100db3988787aa30e2c066a8b7694ece52d
author pasquier-s <spasquier@mirantis.com> 1480060888 +0100
committer GitHub <noreply@github.com> 1480060888 +0100

Merge pull request #12 from simonpasquier/stacklight

Merge master into stacklight