Merge branch '4.3' into 4.4 Conflicts: source/accounts.rst source/service_offerings.rst
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/6507638e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/6507638e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/6507638e Branch: refs/heads/master Commit: 6507638eccd62faa27846031cda9948fff8899b4 Parents: 00c90ec 5d59a37 Author: Rajani Karuturi <rajanikarut...@gmail.com> Authored: Wed Sep 10 12:08:26 2014 +0530 Committer: Rajani Karuturi <rajanikarut...@gmail.com> Committed: Wed Sep 10 12:08:26 2014 +0530 ---------------------------------------------------------------------- .gitattributes | 2 + source/accounts.rst | 10 +- source/locale/zh_CN/LC_MESSAGES/networking2.mo | Bin 0 -> 286127 bytes source/locale/zh_CN/LC_MESSAGES/networking2.po | 8448 +++++++++++++++++++ 4 files changed, 8457 insertions(+), 3 deletions(-) ----------------------------------------------------------------------