projects / osm / vim-emu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71b3a2f 92237dc)
Merge branch 'dev-sonata-dummy-gatekeeper'
authorpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 21 Mar 2016 14:57:40 +0000 (15:57 +0100)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 21 Mar 2016 14:57:40 +0000 (15:57 +0100)

Trivial merge