Merge branch 'master' of git.bfh.ch:/staff/goc4/2018bti7061
authorChristian Grothoff <christian@grothoff.org>
Tue, 25 Sep 2018 18:09:49 +0000 (20:09 +0200)
committerChristian Grothoff <christian@grothoff.org>
Tue, 25 Sep 2018 18:09:49 +0000 (20:09 +0200)
commit2347beeb1d40e69bff6baaf019a31f2ccdbc2f24
tree4ae72e11962a3a17c461cc36dfb053b75d86f044
parent43a120fa18b9c9c42a51596caecf57b24b54e0e8
parentb3b269619a2c401e3c4b923bc0d6b41ae7ecdff9
Merge branch 'master' of git.bfh.ch:/staff/goc4/2018bti7061