Merge "Add git branch & tag info to version file"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Tue, 3 Jan 2017 08:02:14 +0000 (08:02 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 3 Jan 2017 08:02:14 +0000 (08:02 +0000)

Trivial merge