Merge branch 'bugfix/6372-squashfs-sort-file-update' into stable
commit0a1bca61b8d151e7dea19bfd643896111b824ee7
authorTails developers <amnesia@boum.org>
Sun, 10 Aug 2014 18:05:10 +0000 (10 18:05 +0000)
committerTails developers <amnesia@boum.org>
Sun, 10 Aug 2014 18:05:10 +0000 (10 18:05 +0000)
tree1c97d73e1c82773f89aadf3c60585b53834a4b70
parent982849390c86b587ffebfc60ae24a71961a83c1f
parent9a74be6ae2bb05a7bc3275a37b7de5dd01ac4abc
Merge branch 'bugfix/6372-squashfs-sort-file-update' into stable