Merge tag 'upstream/0.8.0.5'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 11 Apr 2014 06:50:18 +0000 (08:50 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 11 Apr 2014 06:50:18 +0000 (08:50 +0200)
commit048babad890813edddc887c425a6c34b6260e287
tree7dd47b16995472f332147f9df7f87e48fe4c70a0
parent0ac0b192bf755986b82b04e060370887a638e188
parentaa433d8260471f960805ed2aafe39c4093c1d51c
Merge tag 'upstream/0.8.0.5'

Upstream version 0.8.0.5