Merge "Bug 509: Improve conflict detection of leaf merges"
authorTony Tkacik <ttkacik@cisco.com>
Thu, 15 May 2014 15:50:38 +0000 (15:50 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 15 May 2014 15:50:38 +0000 (15:50 +0000)

Trivial merge

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.