tree 8b7554f212c2ccf51a2190b11e4072e2e5c55b8a
parent 67a291819201adb21da9c0d614cde7260228747c
parent c69012544408e0e43c1e26db22bcc5cfe168d5a1
author pasquier-s <spasquier@mirantis.com> 1480060922 +0100
committer GitHub <noreply@github.com> 1480060922 +0100

Merge pull request #19 from simonpasquier/stacklight

Merge master into stacklight