Merge commit 'upstream/0.2.3'
authorCharles Plessy <plessy@debian.org>
Thu, 9 Dec 2010 09:56:36 +0000 (18:56 +0900)
committerCharles Plessy <plessy@debian.org>
Thu, 9 Dec 2010 09:56:36 +0000 (18:56 +0900)
commite6b0135a2f750f699ced6d941259be087b954d81
treef4f3c0c3897c8a03daa85b963ec8dbf220e09406
parentdff333c8e17e293d58c4c3dd979ae4c96945afbb
parent3be5ff47495762af7f2ebec145bc8f9c7674593d
Merge commit 'upstream/0.2.3'