Merge branch 'master' of git://git.tails.boum.org/tailsmaster
commitb31ca6be88477373baf59fd8421b6410d1ca5b39
authorTails developers <amnesia@boum.org>
Tue, 3 Feb 2015 11:13:27 +0000 (3 12:13 +0100)
committerTails developers <amnesia@boum.org>
Tue, 3 Feb 2015 11:13:27 +0000 (3 12:13 +0100)
tree30634e388595df483af15251ee5af505aded57af
parentc59e0ab441ba7b6f518a816b7ee305853fc90cb7
parentd8dbc95b4311e71066dd6e38c8483e0edd7cafeb
Merge branch 'master' of git://git.tails.boum.org/tails