Skip to content
Snippets Groups Projects
Commit 1d28e876 authored by Dmitry E. Oboukhov's avatar Dmitry E. Oboukhov
Browse files

Merge branch 'stable' into 1.6 

Conflicts:
	debian/changelog
	debian/control
	src/lib/small
parents 648e9abd 2ae87677
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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