Merge branch 'master' into credentials
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Sat, 19 Nov 2016 23:23:07 +0000 (00:23 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Sat, 19 Nov 2016 23:23:07 +0000 (00:23 +0100)
commit691aa85bfaec80c08330db772499a123b2ac2373
tree2e1ff2f4b5acba693b9bc1ae01dd4acb2cee8d1c
parent39981eee3163a1795026e8670ac5b669426f268b
parentffc906fa758dcc89eaabce14b754d311d3321dd4
Merge branch 'master' into credentials