Changes from org.oe.dev: * Include latest (stable) patchset * Change from RCONFLICTS to RREPLACES where possible (gvim->vim->tiny-vim) Signed-off-by: Michael Lippautz <michael.lippautz@gmail.com>