projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cd0246 92db7f0)
Merge pull request #116 from mpeuster/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 16 Jun 2016 10:13:50 +0000 (11:13 +0100)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Thu, 16 Jun 2016 10:13:50 +0000 (11:13 +0100)
test


Trivial merge