CVS: cvs.openbsd.org: src

[James Turner]

CVSROOT:        /cvs
Module name:    src
Changes by:     jtur...@cvs.openbsd.org 2013/09/21 11:43:28

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

Log message:
Merge conflicts.