Merge branch 'orig' into mdb
authorHoward Chu <hyc@symas.com>
Sun, 3 Mar 2013 14:27:54 +0000 (06:27 -0800)
committerHoward Chu <hyc@symas.com>
Sun, 3 Mar 2013 14:27:54 +0000 (06:27 -0800)
commita72df83de4abd519be584c90c0091cc0fbf3ad3a
tree6c64d43cbc058b520cab088d8b2c4f0164a29f40
parent34e8656a234bb52fd31627c4820758be32828048
parentd9196bab90869b8ca0e767060dfd9cf4cf2835d4
Merge branch 'orig' into mdb

Conflicts:
src/backup.c
src/btree.c
src/btreeInt.h
src/pager.c
src/pcache1.c
src/wal.c
src/pager.h
src/printf.c
src/test2.c
src/test3.c
src/test_stat.c