Merge commit 'upstream/0.1.11'
authorCharles Plessy <plessy@debian.org>
Fri, 3 Dec 2010 04:24:35 +0000 (13:24 +0900)
committerCharles Plessy <plessy@debian.org>
Fri, 3 Dec 2010 04:24:35 +0000 (13:24 +0900)
commit78c7059ff49802b06e7318fb6ad9a0908e80903b
tree0e95167bb6d2d1736aa5349359db5871339e4661
parente5065a549a71d049fb91f4750cb81007ad7f12e6
parent6a0c6f060a60789b48e10a72b1381f6e54599302
Merge commit 'upstream/0.1.11'