Merge commit 'origin/1.0-bugfix'
authorRémi Denis-Courmont <remi@remlab.net>
Thu, 14 May 2009 15:54:17 +0000 (18:54 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Thu, 14 May 2009 15:54:17 +0000 (18:54 +0300)
commitfd7f8f854a13f7b65cb2b8622755aa47ee932919
tree138ba7aa83815b400454f27d1cc5e2606374fbd9
parent8e1f14148bf158e37a838da2ac04062fd2a0aca1
parent0dec2f724e06c4f13b85cf02b2ac2fcb8e9b4e56
Merge commit 'origin/1.0-bugfix'