Merge tag 'upstream/0.8.0.6'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 16:36:53 +0000 (12:36 -0400)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 16:36:53 +0000 (12:36 -0400)
commitbb3567b1b6ca6b747693cdf5d7bdf3e49b27d7da
tree889eaa13759a8e7e9defe36af75e8a38c28c35bb
parent25e1cfa0080c8d6db0e9762e614a6a5a2f1be4fb
parenta94b874eaee78ddcdb2271ccb31e8230701cffdd
Merge tag 'upstream/0.8.0.6'

Upstream version 0.8.0.6