Merge branch 'master' of git://git.qubes-os.org/joanna/linux-utils

Conflicts:
	version
release2 mm_c3ef1acb
Marek Marczykowski-Górecki 11 years ago
commit c3ef1acb1a

@ -1 +1 @@
1.2.1
1.3

Loading…
Cancel
Save