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)
commitcba26ddadd3aa7d9bd44db878a9d5ce25c81bd46
tree61facbf687ab23ec43f80ec9e975b4902185c1a9
parent2c53f1b13419f91afacda02f467a60336e89a86e
parentb1ad3d825e9b8fd904ac55ad4e661d63af0ba82d
Merge tag 'upstream/1.1.3'

Upstream version 1.1.3