projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e66ef12 c6c5aba)
Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Tue, 3 May 2016 09:23:43 +0000 (11:23 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Tue, 3 May 2016 09:23:43 +0000 (11:23 +0200)

Trivial merge