Merge branch 'black_magic'
commitdef6a2182c33e38355f6fd71591168bb0760e20a
authorLauri Tirkkonen <lotheac@iki.fi>
Wed, 14 Jun 2017 18:05:16 +0000 (14 21:05 +0300)
committerLauri Tirkkonen <lotheac@iki.fi>
Wed, 14 Jun 2017 18:05:16 +0000 (14 21:05 +0300)
treec55d1c51693a0b8e3e03b82de2d132c91b946e46
parent35320b3a8bf0b6e0e5b8e964a886678d82e54e00
parent114de5f95a793fe7788fdcf987d9bc08f4bea346
Merge branch 'black_magic'