Merge branch 'master' into martin-t/defaults 459/head
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Aug 2017 00:57:23 +0000 (02:57 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Aug 2017 00:57:23 +0000 (02:57 +0200)
commitae277921268b84c7b7ee5ab901ce7f0088c07605
treebae3351f0aeab2f1de9abf5ea7c16970e1e35e8c
parent90da6817bc443ee9402472527e746af2c254926e
parentb283d314c0c619a12b54c6094ade99ed69daed67
Merge branch 'master' into martin-t/defaults