Merge remote-tracking branch 'origin/identity_abe'
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 4 Jan 2018 15:07:55 +0000 (16:07 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 4 Jan 2018 15:07:55 +0000 (16:07 +0100)
commit056ca89d207cd1865a90fe3fcd430a4381097da5
tree928a3f7bf520ec99ac1bdbceb423dd68d375acbb
parentb4f6c5a8b521d4942d19f5a34929bebaa60a6210
parent78705d5a49d7066a01b832546d2507456a3c5d2c
Merge remote-tracking branch 'origin/identity_abe'