Merge remote-tracking branch 'origin/devel' into devel
commitc5ea5349b2a2fdefedc6c5ff382e33690d92d4a4
authorTails developers <amnesia@boum.org>
Wed, 15 May 2013 09:29:50 +0000 (15 11:29 +0200)
committerTails developers <amnesia@boum.org>
Wed, 15 May 2013 09:29:50 +0000 (15 11:29 +0200)
treec931a47d6d8d2197591d063d5396f78cae4cb76d
parent95319ca2394513e9f54ba987f3e29e6b2d55dcf9
parent2132aec980087ae9fd7938f7d6e41d5a93f97e71
Merge remote-tracking branch 'origin/devel' into devel