tree 7837f17db65283e7f66cc45425fff84e54c6960a
parent 69a5c3ab74e8eda0068917ac2a2859b28e988f8a
parent 52245f86e42a54dee80d5d412770a5e9bce5cf4f
author Sebastien Goasguen <runseb@gmail.com> 1395652059 +0100
committer Sebastien Goasguen <runseb@gmail.com> 1395652059 +0100

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin