Merge tag 'upstream/0.8.0.6'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 25 Apr 2014 09:07:13 +0000 (11:07 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 25 Apr 2014 09:07:13 +0000 (11:07 +0200)
commit04038367eb053fdb5b8e5a5bfd9f7ad51f293751
treeb9ede898cf6ffa30bb54e50ed173100fe57244da
parentaf65b869406b635761b3c21b65031ed4dc1e04a0
parentff4ef48059048e93efa634e36d2ad10973a13de3
Merge tag 'upstream/0.8.0.6'

Upstream version 0.8.0.6