Merge branch 'sqlite' into 2.2.x v2.2-beta2
authorAndrey Karlov <dein.negativ@gmail.com>
Mon, 3 Jan 2011 07:17:26 +0000 (10:17 +0300)
committerAndrey Karlov <dein.negativ@gmail.com>
Mon, 3 Jan 2011 07:17:26 +0000 (10:17 +0300)
commitcd87eb220a6eacc62c41410d78098d7588aa9f8c
treee44a98c3e36d0983f5b1d747c801ae3f7a520c63
parentd24f2db239adec3991a34e1d94e5d2e90899002e
parent5b869b132e160a22bcf2b3c445860ff718873834
Merge branch 'sqlite' into 2.2.x