projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60bf8b8 2c4df16)
Merge remote-tracking branch 'upstream/master'
authorpeusterm <manuel.peuster@uni-paderborn.de>
Wed, 6 Apr 2016 12:13:39 +0000 (14:13 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Wed, 6 Apr 2016 12:13:39 +0000 (14:13 +0200)

Trivial merge