Merge commit 'upstream/0.3.4'
authorMichael Prokop <mika@debian.org>
Mon, 2 Jan 2012 10:07:01 +0000 (11:07 +0100)
committerMichael Prokop <mika@debian.org>
Mon, 2 Jan 2012 10:07:01 +0000 (11:07 +0100)
commit99099a6ccd03e2917bf29f8905e376c20033252a
treec73c7a0f512f1ba056a0fde5ba1a57c647eacaea
parentafc36396ff73d5a2bbfe83afdc1919aa743d96c8
parentef0cacf2508418915d3f64b04003be3c13fed3cc
Merge commit 'upstream/0.3.4'