Commit 2e9871ce authored by Martin Lucina's avatar Martin Lucina

Merge branch 'maint'

Conflicts:
	configure.in
Signed-off-by: 's avatarMartin Lucina <mato@kotelna.sk>
parents eeb8e7c8 5b440256
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment