Merge branch 'yarons-patch-3'
commite5b5f1716a3d58c698781a4f28e480440abbef43
authorStefan Kögl <stefan@skoegl.net>
Fri, 29 Jun 2018 20:10:35 +0000 (29 22:10 +0200)
committerStefan Kögl <stefan@skoegl.net>
Fri, 29 Jun 2018 20:10:35 +0000 (29 22:10 +0200)
tree780566ab197adcf4719e1262c1537ac1fd2b2332
parenta1b926fc9b4b5497462095ca9b6c99435a5150f8
parent302688c039b3ee646e99cc4b87ea589646c8513a
Merge branch 'yarons-patch-3'