projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0414261 b77a278)
Merge remote-tracking branch 'steven/master'
authorpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 6 Feb 2017 11:32:54 +0000 (12:32 +0100)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 6 Feb 2017 11:32:54 +0000 (12:32 +0100)

Trivial merge