Merge branch 'testing' of ssh://webmasters.boum.org/~/wiki into testing0.8-rc1
commit50e393e1cc3c91cd3d2525a65da2a9a7e2d8e064
authorTails developers <amnesia@boum.org>
Fri, 9 Sep 2011 12:15:57 +0000 (9 14:15 +0200)
committerTails developers <amnesia@boum.org>
Fri, 9 Sep 2011 12:15:57 +0000 (9 14:15 +0200)
tree641ff8cdf211b7ec85a279fd50d123c2c62d03cd
parent240a99172dddf9daac4b34f34c8884a5efe6e2b4
parentb0a651d0ca2d49119b1aa8649a32b1ac66fc08dd
Merge branch 'testing' of ssh://webmasters.boum.org/~/wiki into testing