Merge commit 'upstream/0.1.15'
authorCharles Plessy <plessy@debian.org>
Tue, 12 Apr 2011 10:40:07 +0000 (19:40 +0900)
committerCharles Plessy <plessy@debian.org>
Tue, 12 Apr 2011 10:40:07 +0000 (19:40 +0900)
commit0242bdf14e88f1058887598cbf898c0d0af01a82
treecd77bae634c6d8edcee029bc75571a18c4cfcc76
parentced7709f121a00d5049d99ee8576037994aab1d1
parente42445c748ed193f8d0a4277a844fa848f30c132
Merge commit 'upstream/0.1.15'