Merge updates from trunk.

FossilOrigin-Name: 435ce3b3fc0cffb4d7e6f2694c3100066e19f9ed

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index d61ee006e2afb04a47b411553207a4b93cf7c358,63dc84526895086dbce2f7ab646dbba858627606..91afd84b3cd8b444cf96cb599be3be86ffe3feed
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
 -C Test\sthat\sthe\sunicode61\stokenchars=\sand\sseparators=\soptions\swork\swith\sthe\sfts3tokenize\svirtual\stable.
 -D 2013-09-18T11:16:32.742
 +C Merge\supdates\sfrom\strunk.
- D 2013-09-06T22:27:55.935
++D 2013-09-24T19:07:48.655
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc bf73c5d1f39a132901cc0a9aea88e724cd0340ad
 -F Makefile.msc 9af063716f726a73b5d5c98c69ea97eca6a9369b
++F Makefile.msc ef17891ca710b1e7bc9cbab2061381884362aeb3
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a8d1f6839521130dc73c5408cdd24bcfd791df34
@@@ -170,12 -170,12 +170,12 @@@ F src/build.c f63e8929c7f89c0074fbc7492
  F src/callback.c f99a8957ba2adf369645fac0db09ad8adcf1caa2
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c
- F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
+ F src/date.c 65196e95e69f36993659bd7781abe7c2f1994739
  F src/delete.c 2dc64ca360b7d7da481183ea920a813a0c203c97
- F src/expr.c 33ae44812d25799000dbcfd54bb2142b30cdd049
+ F src/expr.c 1017f482217e093ecdaca91e8666681e83733252
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c be866cd8c4fa6cae98ba33109578fd1a3311ee5b
- F src/func.c 8eed739f11acd20fb89a82bf0ad60f75b0a8f907
 -F src/func.c 2c47b65e6e00e3e9374942f28254faf8adafe398
++F src/func.c 5fb4103cc5fd2920696e0a263e6a56a2844ab35d
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@@ -1111,8 -1113,8 +1114,8 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
- F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 6caa2cd10421a85db6740fb2ae8a42b573959562 97b10e66e98e84755aa577f8da017bf1aea2056c
- R 10ba881e2c7b774138e3a52c0d93d6d1
+ F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
 -P cebd6fc551d26aea0f28cd7d25338fe0b72aae88
 -R 912d3a86c8cb4e429312147af7faaf76
 -U dan
 -Z 5b7e8c5d08bc668689f4627e9e0e9c87
++P 8922be1a3e0269552e12b87fe1e5141c38a8d3f8 ed24051462c09220ebfb82a347b4a2b5c820ef63
++R 4d2894e447b5c39e0b9e2bc56076987a
 +U mistachkin
- Z d4c0acc5b28a494c6ee6d9515debd6eb
++Z 7dee757dc233dca1626329d37ad8fbdb

diff --cc manifest.uuid
index 3928ea3cb285bcbc20e708dfdce12c86dbc9ea19,e597548d6521cf6c341e636585290cb64872ca36..1e728ca034747ba6d06fa49a0e0504e9785f39ee
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8922be1a3e0269552e12b87fe1e5141c38a8d3f8
 -ed24051462c09220ebfb82a347b4a2b5c820ef63
++435ce3b3fc0cffb4d7e6f2694c3100066e19f9ed

diff --cc src/func.c
Simple merge