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

Conflicts:
	version
This commit is contained in:
Marek Marczykowski-Górecki 2013-10-11 12:56:58 +02:00
commit c3ef1acb1a

View File

@ -1 +1 @@
1.2.1 1.3