projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 307aa1f d806ed7)
Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 6 May 2016 08:35:48 +0000 (10:35 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 6 May 2016 08:35:48 +0000 (10:35 +0200)

Trivial merge