Merge branch 'alexandre/inf7741'
authorJean Privat <jean@pryen.org>
Tue, 2 Oct 2012 20:02:12 +0000 (16:02 -0400)
committerJean Privat <jean@pryen.org>
Tue, 2 Oct 2012 20:02:12 +0000 (16:02 -0400)
commit13970f03d16d14bec6d75756240c1564c8d75813
treef60e1c0df57096fb819462422f11cb76c6fbd603
parent8c31f6a34b7f995d8a0e565b1045918063ec9e50
parent6843df4c725a52f0ccd4b6880423c93c84165d10
Merge branch 'alexandre/inf7741'