Merge branch 'develop' into 'master'

put vrouter definition back

See merge request !5
tree: ed8a64c9f9e9bec3f204c4b2c2eac1db7e9b6f0e
  1. debian/
  2. heka/
  3. metadata/
  4. CHANGELOG.rst
  5. LICENSE
  6. README.rst
  7. VERSION