Merge branches 'upstream' and 'dev/dht' into dev/3.0.8
commitf037d87c19947407d17e983cc33bb0f092a2e069
authorygrek <ygrek@autistici.org>
Sun, 20 Mar 2011 09:10:45 +0000 (20 11:10 +0200)
committerygrek <ygrek@autistici.org>
Sun, 20 Mar 2011 09:10:45 +0000 (20 11:10 +0200)
treef6a1970ca940d51b743f90b9d1c652f8d1ea47f0
parent4f94ebf0491d5cdf0a97533d873c951e08b7cd07
parentacfab7b692dd997a8556d214a5e9bad7b79f9500
parent34c8b02ffb322f60025ba88cc5ff8148a9238bcb
Merge branches 'upstream' and 'dev/dht' into dev/3.0.8