Merge conflicts
authorjturner <jturner@openbsd.org>
Sun, 19 Apr 2015 14:25:05 +0000 (14:25 +0000)
committerjturner <jturner@openbsd.org>
Sun, 19 Apr 2015 14:25:05 +0000 (14:25 +0000)
commit57f78ff689e03c105c599b9f9b7894fe8db5dd49
treee16889be0f2f5dd197e002d9c0386c417f9f70a0
parent69c34eaaf29fe77dac7242155496c52d521ae721
Merge conflicts
usr.bin/sqlite3/shell.c