Merge commit 'origin/base'
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 31 May 2009 19:30:31 +0000 (22:30 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 31 May 2009 19:30:31 +0000 (22:30 +0300)
commit4b44912ce0888ed40d35aa5d782cd17cbf7e9c6b
tree9b44c0db8d63cf7c81f7917f15e6376fb467e099
parent8d812e0a8417d97334ad008185cd9ece30294ab3
parent6520db28ddffcc6e3be403d28b6897cd51fc65cb
Merge commit 'origin/base'