tree c261b33f6bdb85e36dcbf2a500cab771889f7fff
parent 51cecf023c7eb3a7fb4ac11c34f93ed8ccfe106c
parent c75ba39d84b20a84d7e401273697d9cec8d6f5d8
author Simon Pasquier <spasquier@mirantis.com> 1480003798 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1480003798 +0100

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