Merge branch '4.4'
Conflicts:
source/accounts.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/36e50600
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/36e50600
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/36e50600
Branch: refs/heads/master
Commit: 36e506009660e61eb6f1a704d3380889164e1c59
Parents: 26cd1b7 6507638
Author: Rajani Karuturi <[email protected]>
Authored: Wed Sep 10 12:11:20 2014 +0530
Committer: Rajani Karuturi <[email protected]>
Committed: Wed Sep 10 12:11:20 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/36e50600/source/accounts.rst
----------------------------------------------------------------------
