Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commita76122f0915542245059432856f8e3e87d460f14
authorTails developers <amnesia@boum.org>
Sun, 12 Jan 2014 11:34:53 +0000 (12 11:34 +0000)
committerTails developers <amnesia@boum.org>
Sun, 12 Jan 2014 11:34:53 +0000 (12 11:34 +0000)
treed932cd9d574d3435ad374030e23759c6b21164bd
parentca18956daa6bb9c7d61da26407aad1d20107cb1b
parentfb289f6bee6f000f26cad374d1ad27c627e4856b
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki