projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3862357 7597408)
Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 29 Apr 2016 10:41:06 +0000 (12:41 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 29 Apr 2016 10:41:06 +0000 (12:41 +0200)

Trivial merge