From: Ryota Mibu <r-mibu@cq.jp.nec.com>
Date: Mon, 30 Jan 2017 01:54:32 +0000 (+0000)
Subject: Merge "Change choosing strategy for docs merge to git-scm"
X-Git-Tag: danube.1.0~404
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=fab20481e7abc89ea512b99b6a8d078d126acd97

Merge "Change choosing strategy for docs merge to git-scm"
---

fab20481e7abc89ea512b99b6a8d078d126acd97