Merge updates from trunk.
commitb7a5dd17dc9b34637bd86d79c7ce67115458625f
authorJoe Mistachkin <sqlite@mistachkin.com>
Mon, 11 Apr 2016 22:24:03 +0000 (11 22:24 +0000)
committerJoe Mistachkin <sqlite@mistachkin.com>
Mon, 11 Apr 2016 22:24:03 +0000 (11 22:24 +0000)
tree610e4c30541ecd1725bdbd03a2131081b14eb1a3
parent652c303ff7ddb98fda60ea6e836f7d9695e6d7d9
parent035df9a694713fed1440e39b2d782ba5e328edff
Merge updates from trunk.