tree ddaedce41157e122ba35e9b085b0bd97a3ab586e
parent 17468ca3631f1e67e7a751830273b5665575bd73
parent 1dde6893e90b0e9d53b9fd344e4eb2d3a0480c71
author René Nyffenegger 1451604120 +0100
committer René Nyffenegger 1451604120 +0100
Merge branch 'fixTypoBranch'