summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-01-19 11:18:30 +0000
committerTails developers <amnesia@boum.org>2015-01-19 11:18:30 +0000
commitd2a56fc0a418995bd56b7cd63485fd6b1013b9f2 (patch)
tree2ea9ff34967a5d409289dfd979eae7602e1c4d39
parentecb7555567e13fd3800e03d50f711bac3cd7ad5c (diff)
parent5ea0db31d7f59ac1c3b1d27043808030bebe88b8 (diff)
Merge branch 'stable' into devel
Conflicts: debian/changelog
0 files changed, 0 insertions, 0 deletions