projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3ddeba 2b7765f)
Merge remote-tracking branch 'upstream/master'
authorpeusterm <manuel.peuster@uni-paderborn.de>
Fri, 13 May 2016 12:40:21 +0000 (14:40 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Fri, 13 May 2016 12:40:21 +0000 (14:40 +0200)

Trivial merge