Skip to content
Commit 2f7f7cec authored by Jakob Bornecrantz's avatar Jakob Bornecrantz
Browse files

Merge branch 'master' into libkms-master 

Conflicts:
	configure.ac
parents d6059c3d 6d3b8bbd
Expand all Hide whitespace changes
Inline Side-by-side
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