Merge branch 'upstream' master
authorSteven Noonan <steven@uplinklabs.net>
Mon, 9 May 2011 04:03:31 +0000 (21:03 -0700)
committerSteven Noonan <steven@uplinklabs.net>
Mon, 9 May 2011 04:03:31 +0000 (21:03 -0700)
commitac8f13c96c1c53f7ade157155bc5f16594ea369d
tree8e7ba7f0b8ebc43fcf4fe41e41b73430f92ef025
parentb8c97acbce70d96f56b32375b3b1e07926f9ee59
parent1bc8f8a83a600c4a1d9f88dc8bd7d3c12e4ff89c
Merge branch 'upstream'

Conflicts:
Makefile.am
configure.ac

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