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)
Upstream version 1.0.4


Trivial merge