projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 404f26f adfb016)
Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 4 Aug 2016 11:30:38 +0000 (13:30 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 4 Aug 2016 11:30:38 +0000 (13:30 +0200)

Trivial merge