Merge branch 'master' into mysql
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 16 Sep 2011 14:06:58 +0000 (16:06 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 16 Sep 2011 14:06:58 +0000 (16:06 +0200)
commit5f50ddfae8a7674e98d64ffd19f46d46790056cc
treeb6c3ca00ec9a7dfd5bb2433d8de8ff8d89ffe2d7
parent054557f6891d093957b29636fa2a89c4420fc343
parent6570bf6c599b80edfe0d18f28d963decd4397e6e
Merge branch 'master' into mysql