Merge "Temporary remove inlines to unbreak compilation with GCC 5"
authorDamjan Marion <damarion@cisco.com>
Mon, 18 Jan 2016 13:56:29 +0000 (13:56 +0000)
committerGerrit Code Review <gerrit@fd.io>
Mon, 18 Jan 2016 13:56:30 +0000 (13:56 +0000)

Trivial merge