Merge tag 'upstream/0.8.3+ds1'
authorAfif Elghraoui <afif@ghraoui.name>
Thu, 25 Jun 2015 02:27:39 +0000 (19:27 -0700)
committerAfif Elghraoui <afif@ghraoui.name>
Thu, 25 Jun 2015 02:27:39 +0000 (19:27 -0700)
commitb2cf913fab1d67e9773c9d58b53c2ccfd961cc17
treeb51a51966a126ca75ef66c0f4009ac3b0cb83cde
parent494f56a0138d0e2353f54b5bb50f757e9e9df413
parent3cbc6e03eafa32ac25f5d6bedd8c7019568f7d7c
Merge tag 'upstream/0.8.3+ds1'

Upstream version 0.8.3+ds1