Public Git Hosting - tails-test.git/commit

commit	a81996e716952a8f43d825609132c262c4b99346
author	Tails developers <amnesia@boum.org>
	Mon, 22 Sep 2014 10:09:46 +0000 (22 12:09 +0200)
committer	Tails developers <amnesia@boum.org>
	Mon, 22 Sep 2014 10:09:46 +0000 (22 12:09 +0200)
tree	512100ee3db24cfdd44e4e551643a189c67abe4f	tree \| snapshot (tar.gz zip)
parent	4b0fb4a03d9c5d910140b73b3a6a26f2fd27f1a5	commit \| diff
parent	b0c05150469079f25129d7f3c12c6e86cd59ed04	commit \| diff

Merge remote-tracking branch '451f/web/markup'

Conflicts:
wiki/src/contribute/talk.html