Merge remote-tracking branch 'frithjof/doc/meetings'
commit514317c0d224c33e8f98048d274c11e1adabddc7
authorTails developers <amnesia@boum.org>
Mon, 4 Aug 2014 09:10:56 +0000 (4 09:10 +0000)
committerTails developers <amnesia@boum.org>
Mon, 4 Aug 2014 09:10:56 +0000 (4 09:10 +0000)
tree66bc6a59fd0fce65c961e9fa683a431fc1aa1e53
parentf537ced765071c2aac09b97a3a320ed2829d590b
parenta84b9749d422609319e84c3ca91c280e711673c2
Merge remote-tracking branch 'frithjof/doc/meetings'