Merge branch 'master' into mysql
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 14 Sep 2011 10:41:08 +0000 (12:41 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 14 Sep 2011 10:41:08 +0000 (12:41 +0200)
commit44d66ced0a261746a5e46e34996614f0fdec8864
tree3f645391c0eb34043835ceb574dde064fb6cc58f
parenta3ced9b16b73f14c4cdf0b3d96bad2fb5027cb1b
parent89e3f5d07e383ba806d8295615c16f706788b5e1
Merge branch 'master' into mysql