CVS: cvs.openbsd.org: src

[James Turner]

CVSROOT:        /cvs
Module name:    src
Changes by:     jtur...@cvs.openbsd.org 2015/04/04 17:26:54

Modified files:
        usr.bin/sqlite3: shell.c sqlite3.1 

Log message:
Merge conflicts