Merge "Change version in conf.py to Carbon"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Tue, 9 Aug 2016 21:20:28 +0000 (21:20 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 9 Aug 2016 21:20:28 +0000 (21:20 +0000)

Trivial merge