Merge remote branch 'origin/master' into devel0.15-rc1
commit95afe9e5a91a5e176d9200e270cce3fd06f539ba
authorTails developers <amnesia@boum.org>
Wed, 14 Nov 2012 23:40:32 +0000 (15 00:40 +0100)
committerTails developers <amnesia@boum.org>
Wed, 14 Nov 2012 23:40:32 +0000 (15 00:40 +0100)
tree53845802f1428f53650f1581f7de873976fa0cbc
parentea5fdcfdcf02af153084421188d7dd934b7c5abc
parent55632fad782ad38b3a019bb49a9b30d10ebe63a1
Merge remote branch 'origin/master' into devel