Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit299792880affc49cdfeae095f7caa1f883801a07
authorTails developers <amnesia@boum.org>
Fri, 19 Jul 2013 10:49:56 +0000 (19 12:49 +0200)
committerTails developers <amnesia@boum.org>
Fri, 19 Jul 2013 10:49:56 +0000 (19 12:49 +0200)
treeee4d517682c6f103b8576f5c37187b42879278f9
parentb77be19b407dceecedc6e212816c207d6cc4baf6
parent2b5931ad1959a46f6fefa796ad1d83f6e5c65571
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki