tree ede10153765872b6b3ce962719a2878df28afac3
parent bc75d3a5d2219db296d080df18f92350a4a3db09
parent f605546489b10406c8685efdf0c24fbffd4e8bcc
author Aleš Komárek <mail@newt.cz> 1478531000 +0100
committer Aleš Komárek <mail@newt.cz> 1478531000 +0100

Merge branch 'confrefactor' into 'master'

Confrefactor

Do not merge, just comparing Honza's refactoring

See merge request !1