Merge "Json to composite node test"
authorEd Warnicke <eaw@cisco.com>
Tue, 19 Nov 2013 18:02:53 +0000 (18:02 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 19 Nov 2013 18:02:53 +0000 (18:02 +0000)

Trivial merge