Public Git Hosting - besstails.git/commit

commit	be3dbdb159c74c72d99d227f29708f46439f5b43
author	Tails developers <amnesia@boum.org>
	Thu, 18 Jul 2013 10:14:23 +0000 (18 12:14 +0200)
committer	Tails developers <amnesia@boum.org>
	Thu, 18 Jul 2013 10:14:23 +0000 (18 12:14 +0200)
tree	d8a391d74ad937443d370dc54d0708a8e358683c	tree \| snapshot (tar.gz zip)
parent	266a055633647700d23ed4e272f8e4fe79601354	commit \| diff
parent	843605d6dc06226cabcee5c7b2d366c12bbae897	commit \| diff

Merge remote-tracking branch 'origin/master' into feature/better_task_manager

Conflicts:
wiki/src/todo/decide_TrueCrypt_alternative.mdwn
wiki/src/todo/remember_installed_packages.mdwn
wiki/src/todo/replace_truecrypt_with_tc-play.mdwn
wiki/src/todo/tails-greeter:_revamp_UI.mdwn

18 files changed:

wiki/src/todo/Return_of_Icedove__63__.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/UEFI.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/VoIP_support.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/Wheezy.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/better_task_manager.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/cleanup_up_whisperback_reports.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/decide_TrueCrypt_alternative.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/integrate_with_external_OTR_documentation.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/more_efficient_memory_wipe.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/open_mp3_with_totem_instead_of_audacity.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/persistence:_easier_access_to_Persistent_directory.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/protect_against_external_bus_memory_forensics.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/replace_polipo_with_privoxy__63__.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/replace_truecrypt.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/server_edition.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/split_Git.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/tails-greeter:_always_list_optimal_keyboard_layout.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/tails-greeter:_revamp_UI.mdwn	diff1 \|	diff2 \|	blob \| history

RSS Atom

wiki/src/todo/Return_of_Icedove__63__.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/UEFI.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/VoIP_support.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/Wheezy.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/better_task_manager.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/cleanup_up_whisperback_reports.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/decide_TrueCrypt_alternative.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/integrate_with_external_OTR_documentation.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/more_efficient_memory_wipe.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/open_mp3_with_totem_instead_of_audacity.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/persistence:_easier_access_to_Persistent_directory.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/protect_against_external_bus_memory_forensics.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/replace_polipo_with_privoxy__63__.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/replace_truecrypt.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/server_edition.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/split_Git.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/tails-greeter:_always_list_optimal_keyboard_layout.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/todo/tails-greeter:_revamp_UI.mdwn	diff1 \|	diff2 \|	blob \| history