tree f2e69edd6a6d23f05df35295da187ad2529ba6a0
parent 03471dfde2127c16240699e87588b27688b9b478
parent 69e2cf9691a2ab293d7bf2d99f7509d76283ccd1
author Gregor Riepl <onitake@gmail.com> 1564750115 +0200
committer Gregor Riepl <onitake@gmail.com> 1564750115 +0200

Merge branch 'master' into transfer