Public Git Hosting - tails/vicves.git/commit

commit	af9525731bbfe22792b76e4be986c4385bdd7502
author	Tails developers <amnesia@boum.org>
	Thu, 28 Nov 2013 14:44:25 +0000 (28 14:44 +0000)
committer	Tails developers <amnesia@boum.org>
	Thu, 28 Nov 2013 14:44:25 +0000 (28 14:44 +0000)
tree	23580a6eeedd060f5523be9760e8820b93e432b4	tree \| snapshot (tar.gz zip)
parent	a47c49e24e326e8f2690cb114ee16879ff47c1f9	commit \| diff
parent	082203407f5e90180605245a2e9355c810318843	commit \| diff

Merge remote-tracking branch 'origin/master' into devel

Conflicts:
wiki/src/doc/first_steps/persistence/configure.mdwn

wiki/src/contribute/design.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/contribute/release_process.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/contribute/release_process/iceweasel.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/doc/first_steps/persistence/configure.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/support/known_issues.mdwn	diff1 \|	diff2 \|	blob \| history