Merge tag 'upstream/1.1.3'
authorjporsini <jporsini@debian>
Mon, 29 Sep 2014 08:24:40 +0000 (04:24 -0400)
committerjporsini <jporsini@debian>
Mon, 29 Sep 2014 08:24:40 +0000 (04:24 -0400)
Upstream version 1.1.3


Trivial merge