Merge changes Ifdaf681e,Ifc13df7c
authorEd Warnicke <eaw@cisco.com>
Mon, 11 Nov 2013 14:09:05 +0000 (14:09 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 11 Nov 2013 14:09:05 +0000 (14:09 +0000)
* changes:
  Fixed merge of entries in mock data store
  Added paths and mediatypes from Restconf draft 02


Trivial merge