Merge tag 'upstream/1.0.4'
authorjporsini <jporsini@debian>
Mon, 25 Aug 2014 08:11:37 +0000 (04:11 -0400)
committerjporsini <jporsini@debian>
Mon, 25 Aug 2014 08:11:37 +0000 (04:11 -0400)
commitecd968930278d22ce234485d1bddced831c82f0f
treee1e02f7c6c1d66fedaab531d8f27bdbc1d49d9d0
parente09694aeae697c819fe6410078aeea9e6eac3c25
parent29dd6f0e20b1f109b1fbdd8a30f02b0f0dc1f103
Merge tag 'upstream/1.0.4'

Upstream version 1.0.4