modified:   wheezy/amd64_iso-hybrid/config/hooks/truecrypt.chroot
	modified:   wheezy/amd64_iso-hybrid/config/hooks/v4l.chroot
	modified:   wheezy/amd64_iso-hybrid/config/package-lists/10-common.list.chroot
	modified:   wheezy/amd64_iso-hybrid/config/package-lists/25-devel.list.chroot
	modified:   wheezy/i386_iso-hybrid/config/hooks/truecrypt.chroot
	modified:   wheezy/i386_iso-hybrid/config/hooks/v4l.chroot
	modified:   wheezy/i386_iso-hybrid/config/package-lists/10-common.list.chroot
	modified:   wheezy/lxde_i386_iso-hybrid/config/hooks/v4l.chroot
	modified:   wheezy/lxde_i386_iso-hybrid/config/package-lists/15-livedevelop.list.chroot
	modified:   wheezy/xfce_amd64_iso-hybrid/config/hooks/truecrypt.chroot
	modified:   wheezy/xfce_amd64_iso-hybrid/config/hooks/v4l.chroot
	modified:   wheezy/xfce_amd64_iso-hybrid/config/package-lists/10-common.list.chroot
	modified:   wheezy/xfce_amd64_iso-hybrid/config/package-lists/15-livedevelop.list.chroot
	modified:   wheezy/xfce_amd64_iso-hybrid/config/package-lists/25-devel.list.chroot
	modified:   wheezy/xfce_i386_iso-hybrid/config/hooks/v4l.chroot
	modified:   wheezy/xfce_i386_iso-hybrid/config/package-lists/15-livedevelop.list.chroot
	modified:   wheezy/xfce_i386_iso-hybrid/config/package-lists/25-devel.list.chroot
	new file:   wheezy/amd64_iso-hybrid/config/archives/google-chrome.list.chroot
	new file:   wheezy/i386_iso-hybrid/config/archives/google-chrome.list.chroot
	new file:   wheezy/xfce_amd64_iso-hybrid/config/archives/google-chrome.list.chroot
Merge branch 'master' of http://github.com/mortaromarcello/Livedevelop

Conflicts:
	wheezy/amd64_iso-hybrid/config/hooks/v4l.chroot