Merge commit 'upstream/0.1.14'
authorCharles Plessy <plessy@debian.org>
Tue, 29 Mar 2011 03:52:27 +0000 (12:52 +0900)
committerCharles Plessy <plessy@debian.org>
Tue, 29 Mar 2011 03:52:27 +0000 (12:52 +0900)
commit6828a9a9ef02c5634d488a3b3a52966a92d38088
treed6ab2c0f28339cad428abc4aa6deaf5617e9cfc0
parent9303e89a9fa315bb881ec0776e5268ee19cb7a8e
parentfa217aa47313e2535cbd2d4bb034cfd405162662
Merge commit 'upstream/0.1.14'