Merge "Update lispflowmapping options in custom.properties"
authorMoiz Raja <moraja@cisco.com>
Fri, 10 Apr 2015 15:29:20 +0000 (15:29 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 10 Apr 2015 15:29:22 +0000 (15:29 +0000)

Trivial merge