From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Mon, 21 Mar 2016 07:48:31 +0000 (+0100)
Subject: Merge pull request #59 from mpeuster/master
X-Git-Tag: v3.1~160
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=35c05a1d9a095350f0bd9acb88c3e99e1a884fcd;p=osm%2Fvim-emu.git

Merge pull request #59 from mpeuster/master

Resource model and integration
---

35c05a1d9a095350f0bd9acb88c3e99e1a884fcd