Public Git Hosting - tails-test.git/commit

commit	5946504ffc56fcf360a76fd6cbdc09cf5b4086bc
author	Tails developers <amnesia@boum.org>
	Wed, 8 Oct 2014 15:09:44 +0000 (8 17:09 +0200)
committer	Tails developers <amnesia@boum.org>
	Wed, 8 Oct 2014 15:09:44 +0000 (8 17:09 +0200)
tree	2f7198f3b56ee3d00ef202bfc85cf49c30cb6784	tree \| snapshot (tar.gz zip)
parent	37241c4bb939d6e0996f7ed6c770c8f498c96352	commit \| diff
parent	887bf26175ea2a20b848c077dfc52d10cc3f7ec5	commit \| diff

Merge branch 'feature/7732-i2p-network-manager-hook' into devel

Conflicts:
config/chroot_local-includes/usr/share/tails/firefox-localstore-win8.rdf

tails mirror test with git rewrite

config/chroot_apt/preferences	diff1 \|	diff2 \|	blob \| history
config/chroot_local-hooks/10-tbb	diff1 \|	diff2 \|	blob \| history
config/chroot_local-includes/usr/share/tails/firefox-localstore-win8.rdf	diff1 \|	diff2 \|	blob \| history
wiki/src/contribute/release_process/test.mdwn	diff1 \|	diff2 \|	blob \| history