upstream/1.2.7+debian

Nicolas Dandrimont

@olasd

28cc2e78 · Merge branch 'real_upstream' into upstream · Jun 27, 2011

Upstream version 1.2.7+debian