Merge branch 'master' into mysql
authorJean-Baptiste Petre <jean-baptiste.petre@nexedi.com>
Fri, 9 Sep 2011 15:30:12 +0000 (17:30 +0200)
committerJean-Baptiste Petre <jean-baptiste.petre@nexedi.com>
Fri, 9 Sep 2011 15:30:12 +0000 (17:30 +0200)
commit4a43c472b5ea998a359adfaa01c90b76b8cfad00
tree14863e79947bbea21859f41167d095e3b0eeffef
parentade98a3aac5104f1d20284da3bafa8e32640248d
parentad1afcf9b8a0d8f6f6bb9cd20d795a181421038b
Merge branch 'master' into mysql