Merge commit 'origin/book-stable'
commit8a25b240c7bb139cf647aef620710ac336f63622
authorJérôme Quelin <jquelin@gmail.com>
Fri, 4 Apr 2008 16:54:05 +0000 (4 18:54 +0200)
committerJérôme Quelin <jquelin@gmail.com>
Fri, 4 Apr 2008 16:54:05 +0000 (4 18:54 +0200)
tree9ac8a216b07620aed250a22357aa5f5066d1bbb7
parent2490062c1cefe80ec9482c299988bdddb5459fba
parent2a79a04b7e9b967a2b0d37b27ce8650904b4fc3a
Merge commit 'origin/book-stable'