Merge branch 'master' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 9 Sep 2017 19:24:15 +0000 (21:24 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 9 Sep 2017 19:24:15 +0000 (21:24 +0200)
commitef456a7e36afd5c8279bb91a7d295b9b3fcd94c7
treee8b3c746ec0da8b23199eb0611da53f808ceb5b7
parentc89e099b706d9c07b2ce49fd267c0f35f06f2146
parent1a992df8b237a07c159ffe0cb093d6440780bd8b
Merge branch 'master' into martin-t/okc2