projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7f601c 7e59663)
Merge remote-tracking branch 'remotes/upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 9 Feb 2017 12:56:08 +0000 (13:56 +0100)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 9 Feb 2017 12:56:08 +0000 (13:56 +0100)

Trivial merge