Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit65de9b930d58143768f524b120813452b815ee03
authorTails developers <amnesia@boum.org>
Fri, 19 Jul 2013 09:23:27 +0000 (19 11:23 +0200)
committerTails developers <amnesia@boum.org>
Fri, 19 Jul 2013 09:23:27 +0000 (19 11:23 +0200)
tree81438278dcb22ee056d3bf95784951e5c6b4ca91
parentd58babce10d9c5499bdedd26f9ab9b26ee791db8
parent7fa2ba18026c2070f250c87ddcdcb3958d2045da
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki