Merge branch 'martin-t/okc' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 16:57:50 +0000 (18:57 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 16:57:50 +0000 (18:57 +0200)
commitb2d3d16a9a3e5df1c518ecd2fce0bfa741db190a
tree02eb30130b598ddf52f8d15beaa0666744c36839
parent1deb523af5f2edddb70ed34cbb0d4463f21d6cad
parente6dd8763ecf934f55f4f835e3a587b6fa590f646
Merge branch 'martin-t/okc' into martin-t/okc2