Merge commit 'upstream/0.1.12a'
authorCharles Plessy <plessy@debian.org>
Fri, 3 Dec 2010 04:24:40 +0000 (13:24 +0900)
committerCharles Plessy <plessy@debian.org>
Fri, 3 Dec 2010 04:24:40 +0000 (13:24 +0900)
commitcd828d5407c7f3fecbf48e8a3524cf6f0b86527c
treeaba3dea7467f1ea8915f1ecca6fafa3c47160a24
parent78c7059ff49802b06e7318fb6ad9a0908e80903b
parentf2f3968e11eead9ce5601b01890bc2339ff951e9
Merge commit 'upstream/0.1.12a'