Merge "Change choosing strategy for docs merge to git-scm"
authorRyota Mibu <r-mibu@cq.jp.nec.com>
Mon, 30 Jan 2017 01:54:32 +0000 (01:54 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 30 Jan 2017 01:54:32 +0000 (01:54 +0000)

Trivial merge