Skip to content
Snippets Groups Projects
Commit 8f7b48a3 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch 'master-stable' 

Manually merge a fix for Bug#748599

Conflicts:
	test/box/args.result
parents 5d47d2b6 223458a5
No related merge requests found
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