Merge tag 'upstream/0.8.4+ds'
authorAfif Elghraoui <afif@ghraoui.name>
Thu, 12 Nov 2015 02:46:08 +0000 (18:46 -0800)
committerAfif Elghraoui <afif@ghraoui.name>
Thu, 12 Nov 2015 02:46:08 +0000 (18:46 -0800)
commitb8581f9391086bc43ab30131fb040c593406569d
treef438413952d5ac3fd95b9adc092a2d685f00071a
parentbb7aa1fe4a592c509f84e29ac40b4426d8ce9aa1
parent18e49038bca0bc7775fc8f6e3703b207815a4b91
Merge tag 'upstream/0.8.4+ds'

Upstream version 0.8.4+ds