Merge remote-tracking branch 'mercedes508/master'
commitb06d7451f200a7b2c74bcb9dae4b973b6e39e30c
authorTails developers <amnesia@boum.org>
Fri, 13 Feb 2015 18:27:59 +0000 (13 18:27 +0000)
committerTails developers <amnesia@boum.org>
Fri, 13 Feb 2015 18:27:59 +0000 (13 18:27 +0000)
tree8355f1862752be91d2c43220a2dd63fa1f3e38dd
parent3b21f2b300a95677982586291cd37748c7989aa1
parent15a17d94aa0702356bed86757f1d5c8d99ef3ad6
Merge remote-tracking branch 'mercedes508/master'