Merge tag 'upstream/0.2.6'
authorCharles Plessy <plessy@debian.org>
Fri, 22 Jun 2012 03:42:40 +0000 (12:42 +0900)
committerCharles Plessy <plessy@debian.org>
Fri, 22 Jun 2012 03:42:40 +0000 (12:42 +0900)
commitf96c23c6f65057130fab79f8b7387e0010366809
tree89823caf62154a4b5761910eb095dbec060c8b60
parent3350fbbd1e91bc868206cb722c4382979c6395a7
parent60eb37429f4812e01374ce2624f59ee600a2b452
Merge tag 'upstream/0.2.6'

Upstream version 0.2.6