Merge tag 'upstream/0.0.6'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 21 Apr 2014 08:22:41 +0000 (10:22 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 21 Apr 2014 08:22:41 +0000 (10:22 +0200)
commit997cc00138c36154429f4e3b5f63e48e2e570211
tree9f110ed6145df1d27b44c783308c6788bf2966b2
parentbee8ba898a41656226595f4c2718c1aaae99263e
parentaa682bbdcf2eb58dde602660750f5023688d3ace
Merge tag 'upstream/0.0.6'

Upstream version 0.0.6