Merge remote-tracking branch 'dimitri/master'
authorCédric Villemain <cedric@2ndquadrant.fr>
Tue, 6 Sep 2011 19:49:10 +0000 (21:49 +0200)
committerCédric Villemain <cedric@2ndquadrant.fr>
Tue, 6 Sep 2011 19:49:10 +0000 (21:49 +0200)
commiteeb2bc7c03986d2335b698065be835d36997ac0c
treef00d888c46e09849b3da5d61d0e47dc33b8c6cef
parent2cdf5b68e720756af59bb603f512835c944da32a
parentd994ade3ead590b069a9815af2e854450e3c20db
Merge remote-tracking branch 'dimitri/master'