Merge branch 'master' into martin-t/defaults
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 17 Jul 2017 15:01:21 +0000 (17:01 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 17 Jul 2017 15:01:21 +0000 (17:01 +0200)
commit46f1ac4e74d212b95d3e2d08d36393a14a8e5cb7
treecceca9725b3f7910c9f3f42ba42afc0648ad3d46
parentb9687c372548bf65442173b7bd0713059f14ad14
parent6792b5c14ddf90b92ae8f5d15318322a5d4733b7
Merge branch 'master' into martin-t/defaults
defaultClient.cfg