projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c130523 5ddd8f8)
Merge remote-tracking branch 'upstream/master'
authorpeusterm <manuel.peuster@uni-paderborn.de>
Wed, 11 May 2016 14:17:07 +0000 (16:17 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Wed, 11 May 2016 14:17:07 +0000 (16:17 +0200)

Trivial merge