Merge branch 'stable'
commit2ba8f86a46f1d636532c83fd3f7b2bee85f181ee
authorTails developers <amnesia@boum.org>
Tue, 2 Sep 2014 10:52:34 +0000 (2 12:52 +0200)
committerTails developers <amnesia@boum.org>
Tue, 2 Sep 2014 10:52:34 +0000 (2 12:52 +0200)
treecf8f5313665de41fa3af939ea60fe4d4dacb4223
parent2259d664c8827cd07977711f32709c8a30bba012
parent4beda50d0019e150c893149c1d2ea7e9394d4c0c
Merge branch 'stable'