Merge branch 'master' into magic-number 116/head
authorPeje Nilsson <peje66@gmail.com>
Mon, 19 Jun 2017 22:06:49 +0000 (00:06 +0200)
committerPeje Nilsson <peje66@gmail.com>
Mon, 19 Jun 2017 22:06:49 +0000 (00:06 +0200)
commit4b93fb327a0ae07cf931f0ebc4c9a946e4cafd6c
tree465ea2a12f5d53da5e86cc5c1519f41c8b4c2e3d
parentc84d37091899d4bfcd747dd4afd182d81c3720b3
parent6ecd0010931a988792e672e1fe0a1192fca7b002
Merge branch 'master' into magic-number