Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							9130636c88 
							
						 
					 
					
						
						
							
							Merge branch 'debian'  
						
						... 
						
						
						
						Conflicts:
	misc/qubes-r2.list.in
	misc/qubes-trigger-sync-appmenus.sh
	network/30-qubes-external-ip
	network/qubes-firewall
	vm-systemd/network-proxy-setup.sh
	vm-systemd/prepare-dvm.sh
	vm-systemd/qubes-sysinit.sh 
						
					 
					
						2015-01-30 00:30:24 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							db35abadc8 
							
						 
					 
					
						
						
							
							Use Qubes DB instead of Xenstore  
						
						
						
					 
					
						2014-11-19 15:34:33 +01:00 
						 
				 
			
				
					
						
							
							
								HW42 
							
						 
					 
					
						
						
						
						
							
						
						
							63e915f6d4 
							
						 
					 
					
						
						
							
							Tag for commit  5d68e2cc70 
						
						... 
						
						
						
						-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUTruhAAoJEAY5OLpCz6ck7IcP/i4JXNEMO8vDSgphM50NIIz6
 +hLb+kXBGeL9SsQKRlz000BUOcIsg+d2ibwnTsi1kNuq2OgJOAHAp5hHgHGc5ddG
 0PLFf/Ddexl7/2cG/hKekXiIpXGcuhqgsIfatqcKB228mVLG8y/kqwViIDbMgg10
 X8Aiq1ba0EeHI7xskkPb1hzkszOfLFoEXCRjt+BQsmr+Bll+sAzCS3G9vSbhczFl
 wmTtgOiu2fWsPgOB2O6HYeO0PUUX+jGF/jncZYf85pEwMccNqRIWjSJC6ti533zv
 5x1bWKWFymBAUcTS+xi00FPeatmQ7b5ywMxTwbqIQkE1Mrt436Dz/B1r0E58q0AH
 gu4qG/KPBNdRBD4vPrvLKiyood/XIpvz0+6QqS9rFMKt71OSzmMR1WeLgclCn768
 cR510iZyJjmqe9lLQQTCJr+oqvwiVot7sfsgj1XP5PozalTkdIawioIZjeX5Zz4O
 +zo+P+jIV+P6QbN+0nD+vrW8kSZlM8vt+OVBPhon/bMFxGKZervs7kFUCNPn6fUK
 WNw8lSrKQqJe/a805Ktku8moatVElmexj7XTkII1nnAnEu6/bokJqjCHQ933794l
 ERRwitFN+BWm3OBXq/BsdSnCotT+gnlMEDtuHiD0JHQBGwxAZGQtliQhWLF25Ekh
 BJkmYBjqgnjCsQFUBMnn
 =shGW
 -----END PGP SIGNATURE-----
Merge tag 'mm_5d68e2cc' into debian-systemd
Tag for commit 5d68e2cc70 
						
					 
					
						2014-11-03 04:28:00 +01:00 
						 
				 
			
				
					
						
							
							
								HW42 
							
						 
					 
					
						
						
						
						
							
						
						
							4886411570 
							
						 
					 
					
						
						
							
							various patches for debian  
						
						... 
						
						
						
						this should enable debian based templates to be used as proxy/netvm 
						
					 
					
						2014-09-29 05:25:24 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							41f65f1f5a 
							
						 
					 
					
						
						
							
							firewall: show error message only on actual error  
						
						
						
					 
					
						2014-09-03 09:59:59 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							4c3d5a46c2 
							
						 
					 
					
						
						
							
							firewall: replace deprecated "state" iptables module with "conntrack"  
						
						
						
					 
					
						2014-03-28 02:56:43 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							a19ef6d0db 
							
						 
					 
					
						
						
							
							qubes-firewall: log errors to stderr -> syslog  
						
						... 
						
						
						
						Not only display as notifications (which may be easily missed). 
						
					 
					
						2014-02-22 01:23:27 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							30ca124784 
							
						 
					 
					
						
						
							
							The Underscores Revolution: xenstore paths  
						
						
						
					 
					
						2013-03-14 04:29:15 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							ecc812f350 
							
						 
					 
					
						
						
							
							The Underscores Revolution: filenames  
						
						... 
						
						
						
						Get rid of underscores in filenames, use dashes instead.
This is first part of cleanup in filenames.
"qubes_rpc" still untouched - will be in separate commit. 
						
					 
					
						2013-03-14 01:07:49 +01:00