Merge tag 'upstream/0.8.0.5'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 06:59:09 +0000 (02:59 -0400)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 06:59:09 +0000 (02:59 -0400)
commita7fffa1286f846beec472a1d011e615d2e99419f
treefcc7582721f43fc984e13b4dab3995a9183adadd
parentba85e3eadb75ad8bd62d9f46f5f13c33b42cb864
parent582a4101efc09e95899926f4415960733b72e18e
Merge tag 'upstream/0.8.0.5'

Upstream version 0.8.0.5