Qubes/core-admin @ c47e29ed5011716416d753299778b43d073bb2a6

Wojtek Porczyk 9eafa57539 Merge remote-tracking branch 'marmarek/master' into core3-devel		%!s(int64=8) %!d(string=hai) anos
..
qmemman.conf	c538d536c8 core3: move qmemman	%!s(int64=8) %!d(string=hai) anos
storage.conf	9eafa57539 Merge remote-tracking branch 'marmarek/master' into core3-devel	%!s(int64=8) %!d(string=hai) anos