Merge branch 'upstream'
authorSteven Noonan <steven@uplinklabs.net>
Wed, 6 Oct 2010 21:15:45 +0000 (14:15 -0700)
committerSteven Noonan <steven@uplinklabs.net>
Wed, 6 Oct 2010 21:15:45 +0000 (14:15 -0700)
commitb8c97acbce70d96f56b32375b3b1e07926f9ee59
tree5649e9a65f53873d3855175417b3775b773822aa
parentf6691f4f2818932b069744a20c4818d339da233d
parent1bb4175403756da753469ce04201d4214dbbabca
Merge branch 'upstream'

Conflicts:
.gitignore
configure.ac

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
sqlite3.c