drh
b15393b8d5
Change mkopcodeh.awk into tool/mkopcodeh.tcl.
...
FossilOrigin-Name: ed0ebc460b54939862e3bddee2bb9bcb9f69c747
2015-10-07 02:52:09 +00:00
drh
32af5eda6a
Merge recent enhancements from trunk, and especially the fix for
...
ticket [1b266395d6bc10].
FossilOrigin-Name: b2face9aa95ade96a5666c70b6b31064c1ad0977
2015-09-30 14:50:39 +00:00
drh
2f20e13b83
Enable adding JSON1 by appending the json1.c source file to the amalgamation
...
and compiling with -DSQLITE_ENABLE_JSON1
FossilOrigin-Name: 33404b2029120d4aabe1e25d484871810777e934
2015-09-26 17:44:59 +00:00
drh
9ec0efd946
Merge all the latest trunk enhancements into the sessions branch.
...
FossilOrigin-Name: c91065f8edb1e54076791716fc20d3fcfe3070dc
2015-09-24 14:26:51 +00:00
drh
64ff56f91a
Capture AFL-generated fuzz tests for json1.c into the test/fuzzdata4.db file.
...
FossilOrigin-Name: 10a214fdb3c13b25e0bdd15c975c21c8890c47ee
2015-09-23 11:59:50 +00:00
drh
8911c0b339
Adjust Makefiles to use SQLITE_CORE when statically linking json1.c into
...
test shells.
FossilOrigin-Name: 91682ac39e7db6a5dc8b75695a757449f068184a
2015-09-19 16:45:43 +00:00
drh
d7f2beab86
Include json1.c in fuzzcheck and fuzzershell.
...
FossilOrigin-Name: c4b68eff7f8f5402a9abf378157767b1c96a6101
2015-09-19 14:32:51 +00:00
drh
91762f2d18
Merge the latest trunk enhancements.
...
FossilOrigin-Name: 22ce9218fb2bb56cc5dd4e32077a16f669250d5f
2015-09-14 10:47:29 +00:00
drh
7e698e9d71
In the "parse.out" output file from Lemon, show addition the complete text
...
of rules on reduce actions.
FossilOrigin-Name: b6ffb7e471e51ff69668154ad2c8790e466c9d37
2015-09-07 14:22:24 +00:00
dan
cce413202a
Merge enhancements from trunk.
...
FossilOrigin-Name: 4b49fe996989fe42d2bb1c24e7193fef09c5fc50
2015-09-03 18:57:52 +00:00
dan
bea34fc53a
Fix a problem with fts5 synonyms and phrase queries. Also fix an OOM handling bug in fts5.
...
FossilOrigin-Name: a4c35fa2c94fe34b376670244fe72303c99868c1
2015-09-02 17:34:22 +00:00
drh
5969c657ae
Merge recent enhancements from trunk.
...
FossilOrigin-Name: cb77236673e30af1e8749d984dedecc8f901b255
2015-09-01 18:52:35 +00:00
drh
3be094df69
Link the json1 extension into the command-line shell by default.
...
FossilOrigin-Name: 2e8e239cec5a12ac81cf62c0fbe94fb5713c31b1
2015-08-29 19:03:33 +00:00
drh
6fd5c1e0e8
Fixes for compiler warnings and errors in the makefiles. Rename the
...
one test script to json101.test.
FossilOrigin-Name: 9ff6ccde5f26f18073587c320290570854ffc833
2015-08-21 20:37:12 +00:00
drh
89a10b2d53
Merge recent trunk enhancements, include table-valued functions.
...
FossilOrigin-Name: e9196d566690de0e9815f8cd85be7844322b5a79
2015-08-20 23:54:25 +00:00
drh
03726aaf7f
Merge support for table-valued functions.
...
FossilOrigin-Name: 96a5d44d9fcb7b159c04630ad2d956fe27df5a43
2015-08-19 18:31:11 +00:00
drh
398f872d1f
Virtual table modules with a null xCreate method act as eponymous-only modules -
...
they cannot be used in a CREATE VIRTUAL TABLE statement. Add the series.c
extension that implements a postgres-like generate_series virtual table to
demonstrate this capability.
FossilOrigin-Name: c58426dbd5ea8b8440ebcc1214f79fa63d658216
2015-08-19 13:54:20 +00:00
drh
5fa5c10784
Begin adding an extension that provides JSON SQL functions.
...
FossilOrigin-Name: dde8afdd8dba1d92560326dca7c1cdfedbe5e070
2015-08-12 16:49:40 +00:00
dan
d3789c0028
Add new test file fts5_test_mi.c, containing an implementation of a function similar to FTS4 matchinfo() for FTS5.
...
FossilOrigin-Name: 4f9520a9dc9c667b7fda5b0822de2bf48184ac99
2015-08-04 20:29:00 +00:00
drh
87c44ef2f7
Merge test improvements and minor fixes from trunk.
...
FossilOrigin-Name: 0298a9a780695b666e7c683700d9f2f889d6f826
2015-07-24 22:21:01 +00:00
drh
a523e31a87
New makefile target "fastfuzztest" runs the same tests as "fuzztest" but
...
with a 100M memory size limit. This more than doubles the speed. The
original unlimited "fuzztest" is still run on a "fulltest".
FossilOrigin-Name: cfeb1b1c294c58222549d06819e9df2e300388fd
2015-07-24 17:26:13 +00:00
drh
53e66c3cda
More robust handling of zeroblob() with oversized arguments. Fix fuzzcheck
...
so that it can be run with limited heap memory.
FossilOrigin-Name: 4e3e516a42059c97f42a7eb59bdf5cded0ff843a
2015-07-24 15:49:23 +00:00
drh
244c8d7077
Merge all changes in the latest 3.8.11 beta into the sessions branch.
...
Changes include the rename of OTA to RBU, the WITHOUT-ROWID-OR-Skipscan fix,
and improvements to pcache1.
FossilOrigin-Name: 7f0ee77062d2fcb014942c7c62c163ccc801f21b
2015-07-23 21:59:58 +00:00
drh
cfb8f8d6a9
Change the name of the OTA extension to RBU: Resumable Bulk Update.
...
FossilOrigin-Name: 017c5019e1ce042025d4f327e50ec50af49f9fa4
2015-07-23 20:44:49 +00:00
mistachkin
bc50bb7f53
Further refine FTS5 cleanup in Makefiles.
...
FossilOrigin-Name: b53a95063cf6b8ee8cad77e9fff4c50a356c43bb
2015-07-14 21:56:53 +00:00
drh
38151adfe2
Merge trunk changes, including the addition of FTS5 and pcache1 performance
...
enhancements.
FossilOrigin-Name: db4cbefb8674c6cfff27c1e918741de1885c845c
2015-07-14 15:39:22 +00:00
mistachkin
ebad80e373
Refine cleaning of FTS5 files by Makefile targets.
...
FossilOrigin-Name: e548d77b3c91cdf11c78d1a688fd768e209bdbf5
2015-07-14 00:36:34 +00:00
mistachkin
68b134c73a
Sync up Makefile clean targets for FTS5.
...
FossilOrigin-Name: 43ead44ef6416d69602e123c3be7a258772837f1
2015-07-04 00:04:37 +00:00
dan
a153bbc4c2
Copy fts5.h into the build directory as part of building fts5.c. Also remove code to edit fts5parse.c from various Makefiles and add it to mkfts5c.tcl.
...
FossilOrigin-Name: 4d8f03dc7b6529cf8d46fc0fcc82112c0394dc13
2015-07-02 20:12:34 +00:00
drh
bed6de557a
Merge in the latest enhancements from trunks, especially the use of
...
_byteswap_ulong() and similar intrinsics on MSVC.
FossilOrigin-Name: 85ca4409bdca7aee801e9fba1c49a87fabbf2064
2015-07-02 18:47:12 +00:00
dan
3abdc44e7b
Add fts5_source_id() SQL function, similar to sqlite_source_id().
...
FossilOrigin-Name: ec2573487cb86664f7f056168a764c28ca8236fc
2015-07-02 18:16:02 +00:00
dan
3f09beda45
Remove "#ifdef SQLITE_ENABLE_FTS5" from individual fts5 source files. Add a single "#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS5)" to fts5.c.
...
FossilOrigin-Name: 7819002ed85497bbd0f9cf4d39df641573324436
2015-07-02 15:52:21 +00:00
drh
59b4bd4840
Merge all the latest enhancements from trunk. This merge include FTS5
...
and a number of notable performance enhancements.
FossilOrigin-Name: 39936b33b0668aad81aa574d4d74c92b0ddd218a
2015-06-30 16:29:59 +00:00
dan
018a93d216
Remove unnecessary lines from fts3.h and main.mk.
...
FossilOrigin-Name: c1b268ced38259706674ed2fcbf842d3fbd9fb8c
2015-06-26 20:13:56 +00:00
dan
ed2589f555
Add a script to combine all fts5 code into a single file - fts5.c - that can be used to build an SQLite loadable extension.
...
FossilOrigin-Name: 46e86b0637248fb4d623c97778cc041eabe3636c
2015-06-25 20:10:24 +00:00
dan
c94a08100b
Merge latest trunk changes with this branch. Add tests for columnsize=0.
...
FossilOrigin-Name: ef44c71a22518727030dd90c0139af8973b05841
2015-06-23 15:06:13 +00:00
drh
60c97e6aa8
Merge recent trunk enhancements and fixes.
...
FossilOrigin-Name: c39cb0e2571f58c87053de009e2c135d71b2c3af
2015-06-11 18:01:29 +00:00
drh
905da63a82
"test" targets on all makefiles use --verbose=file --output=test-out.txt.
...
Add the new "quicktest" target to all makefiles - designed to run in under
three minutes. The --quick option on releasetest.tcl now uses quicktest.
FossilOrigin-Name: 6ddef2ad35ceb5822fc14c65bc7c6a2662edb63c
2015-06-10 18:53:09 +00:00
drh
d1f2f9b90c
Add the valgrindfuzz target to unix makefile.
...
FossilOrigin-Name: e62aed01f1a6dbc12d6e21386c1671eb640b8d49
2015-06-08 19:15:50 +00:00
drh
38b4149ca1
Factor out the TreeView parse tree printing module into a separate file.
...
FossilOrigin-Name: c32ce54ca46a4be4373983be6fd44b1f3a0250d1
2015-06-08 15:08:15 +00:00
drh
6c1f4ef217
Split more subfunctions of where.c out into a new whereexpr.c source file,
...
for improved maintainability.
FossilOrigin-Name: 46ef95c108ad8961f2bf3d2dc839d4fb1fddd770
2015-06-08 14:23:15 +00:00
drh
6f82e85a80
Split out the bulk of the actual VDBE code generation logic from where.c
...
into a new file, leaving behind the analysis logic. This makes the original
where.c smaller and hopefully easier to edit.
FossilOrigin-Name: faa0e420e93a2bc1c84df9eb9fef4748d29ce339
2015-06-06 20:12:09 +00:00
dan
167fd757f0
Merge latest trunk changes with this branch.
...
FossilOrigin-Name: c9ffda4abb4390bbc5719e269196e2807b254f97
2015-06-02 18:07:58 +00:00
dan
3f3074e0c1
Remove the "#include sqlite3Int.h" from fts5Int.h.
...
FossilOrigin-Name: e008c3c8e29c843ec945ddad54b9688bbf2bdb44
2015-05-30 11:49:58 +00:00
drh
ad2c1dd782
Import recent enhancements from trunk.
...
FossilOrigin-Name: 54bec164ebeaf62d783352b3c4d0de8845394091
2015-05-29 19:04:58 +00:00
drh
f74d35be8c
Fix a minor and harmless memory leak in fuzzcheck. Adjust the makefiles
...
to run fuzzcheck with --quiet on valgrind tests.
FossilOrigin-Name: 8bfe834432b37f94779da6c71fc369651f024590
2015-05-27 18:19:50 +00:00
drh
1421d980c5
Add the "PRAGMA cell_size_check=ON" command.
...
FossilOrigin-Name: 2ead43f074d01312c7642e1df9abccc95547f019
2015-05-27 03:46:18 +00:00
drh
ea93c7005d
The "make fuzztest" target now uses fuzzcheck instead of fuzzershell.
...
FossilOrigin-Name: 4a5f6f1f0128657fd8d4d99d0682edd5bac2a19e
2015-05-26 18:15:08 +00:00
mistachkin
7a94e6b061
Add fuzzcheck to makefile clean targets. Also, for consistency, replace a few tabs with spaces.
...
FossilOrigin-Name: eda2a437506f148bcb5bb33baa64b5ad8ae73ada
2015-05-26 03:24:33 +00:00
drh
3b74d0327f
First code for a new utility program to rerun checks on a large number of
...
fuzzer-generated test cases.
FossilOrigin-Name: c5b4e363528aa1d2d5f41451f16de0aa91152b38
2015-05-25 18:48:19 +00:00
drh
adf3bf5811
Merge recent trunk changes, include the R-Tree enhancement that allows
...
8-byte BLOB arguments to geometry functions, and the fix for the TEXT affinity
problem that could cause corrupt indexes.
FossilOrigin-Name: 0a0de8b72ca24f287f9c84766a14e12ea4564b59
2015-05-19 22:42:23 +00:00
drh
5f9a57fc49
Merge in the IS-operator enhancements and other recent changes from trunk.
...
FossilOrigin-Name: 4f9229445c293b39c80b2a662901f608c85b36ef
2015-05-14 15:17:20 +00:00
dan
8255079611
Merge latest trunk changes with this branch.
...
FossilOrigin-Name: 299ed55c909d327826ef47e204ef1e9afd54852b
2015-05-14 08:58:52 +00:00
dan
5d03b9d365
Merge latest trunk changes with this branch.
...
FossilOrigin-Name: b5f0e8c5b4bc018d672617ffd342d12b228548b9
2015-05-13 18:12:58 +00:00
mistachkin
d4ab1034c2
Fix minor Makefile typos. Improve consistency of MSVC makefile. Add new targets to clean.
...
FossilOrigin-Name: f84fbe98994c602de6c0b242dcbad3ab77298425
2015-05-11 16:27:33 +00:00
drh
f4375446d1
Build the sqlite3_analyzer.exe and sqldiff.exe programs on "make test"
...
and "make smoketest" and other similar test targets.
FossilOrigin-Name: 1b83f2e7ddfdb488e732731f7a184d37edcad5af
2015-05-11 12:15:45 +00:00
dan
5e38f1c9bf
Add the fts5vocab module, for direct access to the fts5 index.
...
FossilOrigin-Name: 6bf93e3b56e6705b7d12bab5024fc615f373b36c
2015-05-08 20:21:24 +00:00
drh
d689fd3a92
Merge all trunk enhancements and fixes into the sessions branch.
...
FossilOrigin-Name: de7083cfe2bb00b689bec6bcc75e994f564ceda6
2015-05-05 17:12:27 +00:00
drh
1a4a680a38
Rename the test_stat.c source file to dbstat.c and rework the makefiles to
...
make dbstat.c a first-class source module.
FossilOrigin-Name: a24480a474993f82ff58edbe12d2093c59b1a2dc
2015-05-04 18:31:09 +00:00
drh
84ab95395e
Include the "dbstat" virtual table in the amalgamation.
...
FossilOrigin-Name: fc6504aa8ca19b3737f72c1e20db8df6b7608dd2
2015-05-04 17:06:39 +00:00
drh
b3df0c675c
Enhance fuzzershell to accept multiple input files. Add the test/fuzzdata2.txt
...
fuzz test content.
FossilOrigin-Name: ab5523aafe4817232388d28ea99be0953e7dccf3
2015-05-01 19:21:12 +00:00
drh
f332071b7f
Add the fuzzoomtest target to the makefiles. Invoke fuzzoomtest from
...
releasetest.tcl.
FossilOrigin-Name: f60657c2ae8a11f1e546c953bca07d9396142f73
2015-04-25 13:39:29 +00:00
dan
ef8b74324d
Merge latest trunk changes with this branch.
...
FossilOrigin-Name: 1c78d8920fb59da3cb97dd2eb09b3e08dfd14259
2015-04-24 20:18:21 +00:00
drh
8ea5eca183
Run fuzzershell as part of the valgrindtest makefile target.
...
FossilOrigin-Name: 0bb96a037bd7179cb3a6137bb29827fc7d72ec3f
2015-04-24 16:53:03 +00:00
drh
e1a71a582f
Add AFL-generated test cases in the test/fuzzdata1.txt file. Automatically
...
run fuzzershell against those cases on a "make test".
FossilOrigin-Name: 627ea83c26b420088f101801eb8765127f47d2d0
2015-04-24 16:09:12 +00:00
dan
9686db7770
Fix an fts5 build problem in main.mk.
...
FossilOrigin-Name: 60045cedef109f03317dc878fe6bb3d03867ae69
2015-04-24 06:02:29 +00:00
dan
e11afed562
Merge latest trunk changes into this branch.
...
FossilOrigin-Name: 1506e99eca19f72fb59b55ec9e2534505dfa7a6e
2015-04-23 19:32:19 +00:00
dan
062c267dff
Update this branch with latest trunk changes.
...
FossilOrigin-Name: 9797482ded7de985e3b20aedec5e4d81f55065c8
2015-04-22 09:40:35 +00:00
drh
850b0d031d
Merge all recent trunk enhancements and fixes into the sessions branch.
...
FossilOrigin-Name: b8ef1cdee307441e8d97b4bfc21f8547692eea9f
2015-04-20 01:32:53 +00:00
drh
268e72f936
Add the tool/fuzzershell.c utility program.
...
FossilOrigin-Name: db8d9af4d04ee862995ffa13ae6dcd9a1fc72855
2015-04-17 14:30:49 +00:00
drh
fdb031891c
Merge all recent trunk enhancements and fixes into the ota-update branch.
...
FossilOrigin-Name: 9bd3e4453d4ad416f7e3f08f0bd283d34f1c319c
2015-04-15 14:26:04 +00:00
drh
df3c171881
Merge all recent trunk enhancements into the sessions branch.
...
FossilOrigin-Name: 5f14f34f072921e229bc20a5185c0cdb3f464c04
2015-04-12 01:33:37 +00:00
drh
d62c0f4c2d
Add the "sqldiff" utility program.
...
FossilOrigin-Name: 88da5bf5d2c4f848dbd4b5ffb1539abfbbdaff18
2015-04-09 13:34:29 +00:00
drh
57d0d9f33c
Merge all changes for version 3.8.9 into the ota-update branch.
...
FossilOrigin-Name: ec9d907a57fcea72c8a64e521e8a1b5777d67568
2015-04-08 14:01:07 +00:00
drh
edb3e433ba
Merge recent enhancements from trunk.
...
FossilOrigin-Name: aea439bdc6d4d3a8568423171abf381843188826
2015-04-01 16:39:06 +00:00
drh
4c45196a76
Add the "mptest" target to main.mk. Change TRUNCATE and PERSIST to DELETE
...
for mptest.c on Windows because of problems trying to delete the journal.
FossilOrigin-Name: ea697e6d9ff1f4d77774589a02ba4a18feafbf03
2015-03-31 18:05:49 +00:00
dan
71138b0f0f
Merge trunk changes with this branch.
...
FossilOrigin-Name: 142743918fd5a6d79fa10c44398360c3684a255a
2015-03-21 15:45:24 +00:00
drh
a9106ca83d
Merge recent trunk enhancements into the ota-update branch.
...
FossilOrigin-Name: 5489cb68921f62f10d832adbc4d19ea8c6c5da50
2015-03-09 13:24:46 +00:00
drh
c11a172d5f
Merge recent trunk enhancements into the sessions branch.
...
FossilOrigin-Name: 68c8937e83b770d5ec6b1855c1bde81057c11b5f
2015-03-09 13:07:45 +00:00
dan
54fc21438e
Fix some problems with OTA and empty target databases, or target databases with the wrong set of tables. Also add SQLITE_FCNTL_VFSNAME support to the OTA VFS.
...
FossilOrigin-Name: 46119e8d8e391d8dea844352521b58415f7365b1
2015-03-05 16:21:20 +00:00
dan
47c467c80e
Fix a couple of build problems.
...
FossilOrigin-Name: a5d5468c0509d129e198bf9432190ee07cedb7af
2015-03-04 08:29:24 +00:00
drh
8cd5b2546f
Changes so that the amalgamation and the command-line shell build without
...
modifications on VxWorks 7. Still gives a few compiler warnings, and still
mostly untested on that platform.
FossilOrigin-Name: 7d92f1f11ee69b0ba7d5a48f0611016d77d41c78
2015-03-02 22:06:43 +00:00
dan
04f121c187
Change SQLITE_FCNTL_ZIPVFS_PAGER to SQLITE_FCNTL_ZIPVFS.
...
FossilOrigin-Name: f7865b942834dd2f6b865336e08ba1adbf20612a
2015-02-23 15:41:48 +00:00
dan
c76c64f931
Move tcl test code from sqlite3ota.c to new file ext/ota/test_ota.c.
...
FossilOrigin-Name: f20779a6e890ba73bfaa904cefcf3a029b01fed4
2015-02-16 06:27:37 +00:00
dan
cd73244144
Further tweaks to work with zipvfs.
...
FossilOrigin-Name: 0f152416be792457c52417aeb531ac860d12a5bd
2015-02-10 20:00:38 +00:00
drh
1ee4a2dd88
Merge all the latest enhancements from trunk.
...
FossilOrigin-Name: ae7eef117f28a5dae7a05805f2d31ac532a9fcc5
2015-02-06 15:40:32 +00:00
drh
fe9752d934
Merge all changes from index_xinfo, including the move of the pragma table
...
into the separate pragma.h file.
FossilOrigin-Name: 21e95d28a51e56b45a9d4166475972535e53f954
2015-02-04 23:51:59 +00:00
drh
67e65e55ab
Break out the (script-generated) pragma parsing tables into a separate file,
...
pragma.h, to make editing easier.
FossilOrigin-Name: 32c0325bcb083fe3f0f0cfe999d00f754e15299e
2015-02-02 21:34:54 +00:00
dan
601415e2bc
Ensure generated header file fts5parse.h is included in sqlite3.c.
...
FossilOrigin-Name: bc7be2fcfd29d6f1b567b69b3b20896eceb99798
2015-02-02 11:58:21 +00:00
dan
57fec54b53
Fix some problems with building fts5 and fts3 together using the amalgamation.
...
FossilOrigin-Name: fb10bbb9f9c4481e6043d323a3018a4ec68eb0ff
2015-02-02 11:32:20 +00:00
drh
120b3a4f61
Merge in all changes from trunk.
...
FossilOrigin-Name: 17c69be80542c5f84e21d60df3edc49422b087d9
2015-01-28 12:00:40 +00:00
dan
997d798d92
Merge latest trunk changes with this branch.
...
FossilOrigin-Name: b3348b1e07e168b156636a29fc8c6d6afb3129c2
2015-01-21 06:36:07 +00:00
drh
9c2e9f7afa
Merge all 3.8.8 changes into the sessions branch.
...
FossilOrigin-Name: bebd131a3554ea95921e6edbc8aa36674ef25fe3
2015-01-16 12:44:52 +00:00
drh
b43be55e53
Makefile enhancements: (1) Rename autoconf/tea/configure.in to
...
autoconf/tea/configure.ac so that it works with the latest versions of
autoconf. (2) Add the "amalgamation-tarball" targets to Makefile.in and
main.mk (renamed from "dist" in the latter case). (3) Update the
README.first file in autoconf/ (4) The TOP macro
in Makefile.in is now an absolute rather than a relative path.
FossilOrigin-Name: 3bafeec934e56f633d0de6890e84fca990e54435
2015-01-15 15:47:06 +00:00
drh
7a20f698df
Merge trunk 3.8.8 beta changes into the sessions branch
...
FossilOrigin-Name: 0ba124540b5b2a9ceda0f4f4a46e6be54edad813
2015-01-14 17:16:23 +00:00
mistachkin
2318d3387d
Work in progress on fixing harmless compiler warnings when using -W4 and MSVC.
...
FossilOrigin-Name: 856dd245ce037f93d5ae2ddeb4fdf949c1e5c8e9
2015-01-12 18:02:52 +00:00
dan
37db72f1f7
Merge latest trunk changes with this branch.
...
FossilOrigin-Name: 4b3651677e7132c4c45605bc1f216fc08ef31198
2015-01-01 18:03:49 +00:00
dan
6024772ba2
Add a version of the unicode61 tokenizer to fts5.
...
FossilOrigin-Name: d09f7800cf14f73ea86d037107ef80295b2c173a
2015-01-01 16:46:10 +00:00
drh
032f461900
Merge threading fixes from trunk into the sessions branch.
...
FossilOrigin-Name: 9817a2864eebe2dc90ce505fe0faa8b069ff48ff
2014-12-16 01:05:38 +00:00
dan
0420954606
Add extra tests to threadtest3.
...
FossilOrigin-Name: f6bf86f907cbff31bed3cbfc922c10c973575498
2014-12-12 16:39:38 +00:00