Merge branch 'test/fix-detection-of-used-display' into devel
commit8f2b2fa084aa1bab43e72d1cb0bf6eba97f6ea0c
authorTails developers <amnesia@boum.org>
Tue, 15 Oct 2013 12:36:21 +0000 (15 14:36 +0200)
committerTails developers <amnesia@boum.org>
Tue, 15 Oct 2013 12:36:21 +0000 (15 14:36 +0200)
treec8c3a38d1a8bd598c8dfbc7dfddce616fcbcbeaf
parent224a445c5ec6916a11be495eb8464885b5bc8999
parenteeae4b854ed3920152e7d5ce61df7b984a92d590
Merge branch 'test/fix-detection-of-used-display' into devel