Merge branch 'master' into mysql
commitde40a7a1ba69560d41c7c0bc6e080322aa323c4b
authorSergey Yanovich <ynvich@gmail.com>
Sat, 16 Oct 2010 18:49:16 +0000 (16 22:49 +0400)
committerSergey Yanovich <ynvich@gmail.com>
Sat, 16 Oct 2010 18:49:16 +0000 (16 22:49 +0400)
tree7da3a4771c9d9629cfbce0a915403e955554b85b
parent5e9633eb0601e156a3234dd9ae3e1084e4be8289
parent3ac3e8288679ecaa13b443d25df4777d5a9b014f
Merge branch 'master' into mysql