Thomas Waldmann 740312f725 Merge branch '1.0-maint' into merge-1.0-maint 8 years ago
..
borg 740312f725 Merge branch '1.0-maint' into merge-1.0-maint 8 years ago