Merge "Bug 2131 - NPE when starting controller"
authorTony Tkacik <ttkacik@cisco.com>
Thu, 16 Oct 2014 13:02:09 +0000 (13:02 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 16 Oct 2014 13:02:09 +0000 (13:02 +0000)

Trivial merge