Marian Beermann f9aefd6a68 Merge commit '343387b36ef' into merge/1.0-maint 9 years ago
..
borg f9aefd6a68 Merge commit '343387b36ef' into merge/1.0-maint 9 years ago