Marek Marczykowski-Górecki a9a8335403 Merge remote-tracking branch 'oliv/master' into new-backups ... Conflicts: core/qubesutils.py dom0/qvm-core/qubes.py		2013-11-07 22:41:16 +01:00
..
__init__.py	Move all files one level up	2013-03-16 19:56:51 +01:00
.gitignore	Move all files one level up	2013-03-16 19:56:51 +01:00
guihelpers.py	Move all files one level up	2013-03-16 19:56:51 +01:00
qubes.py	Fix qubes.xml unlock code (#748)	2013-10-02 04:54:10 +02:00
qubesutils.py	Merge remote-tracking branch 'oliv/master' into new-backups	2013-11-07 22:41:16 +01:00