Merge branch 'bugfix/6468-disable-webrtc' into testing
commit93098811473e708b9f092969d83ad7af993246b9
authorTails developers <amnesia@boum.org>
Mon, 9 Dec 2013 09:30:33 +0000 (9 09:30 +0000)
committerTails developers <amnesia@boum.org>
Mon, 9 Dec 2013 09:30:33 +0000 (9 09:30 +0000)
treeabab0217ce045e7ca21a74a345cbf8ed9c9997f9
parent3d45f5eb62afe22e4055266cb19221e9ba829813
parent8df851d719dc92430472b5eb8fdb3ca42c34cf0a
Merge branch 'bugfix/6468-disable-webrtc' into testing