tree 10ae1ea09bb29436e68a1dc0036fd936996a0f3b
parent 51a1a6d26a2cb9641ed90412a9f4aecbb3371df5
parent 048330369dac4deee4a6a0559be03f4d5c449983
author Éric Lemoine <elemoine@mirantis.com> 1478274831 +0000
committer Éric Lemoine <elemoine@mirantis.com> 1478274831 +0000

Merge remote-tracking branch 'origin/master' into stacklight-sync-master