Merge branch 'orig' into mdb
authorHoward Chu <hyc@symas.com>
Sun, 3 Mar 2013 13:51:36 +0000 (05:51 -0800)
committerHoward Chu <hyc@symas.com>
Sun, 3 Mar 2013 13:51:36 +0000 (05:51 -0800)
commit53d1731ae806e59f8df7cbcbfb99bf7bf047afda
treeef3eb9953a8bcd0fd6aafb8184bf469a252fd05d
parentab89d11c1346155cf239edd9f1414ae5ec77affa
parent74f025bb481007b9ba95aba17a985cee8bb29872
Merge branch 'orig' into mdb

Conflicts:
src/backup.c
src/btree.c
src/pager.c
src/pcache1.c
src/wal.c
.gitignore
src/pager.h
src/printf.c
src/test_stat.c
src/wal.c