tree 28aa278a3c2eb3428869d0a8e368c25185503193
parent 493a311712e4fc2081e4e674126b107b7ee87db4
parent e2ffb0faf5ef5ac5a7cfde4f6c44be2f6ec6c82e
author Pierre-Luc Dion <pdion891@apache.org> 1453304420 -0500
committer Pierre-Luc Dion <pdion891@apache.org> 1453304420 -0500

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