tree 1baf24665d0a5e489bca297c68430c74eab62624
parent f97a11faff4d87b2fcaa0c7d99eed51f1fbd2d15
parent a7d491a94ae5675b3582aa2f5636d72ae4969c8b
author Mihaly Petrenyi <e.mihaly.petrenyi@gmail.com> 1570132610 +0200
committer Mihaly Petrenyi <e.mihaly.petrenyi@gmail.com> 1570132610 +0200

Merge branch 'stable-2.14'

* stable-2.14:
  Implement configuration file usage

Change-Id: Ia87ad9c9bb71dda1cf13f1daf86bb4aa386cdf25