Merge branch 'master' of webmasters.boum.org:wiki
commitcb2e48a9f30da676a9edff04332c19a310e6d98f
authorTails developers <amnesia@boum.org>
Sun, 22 Feb 2015 19:11:01 +0000 (22 19:11 +0000)
committerTails developers <amnesia@boum.org>
Sun, 22 Feb 2015 19:11:01 +0000 (22 19:11 +0000)
tree343d2a8524b706373dd4e7f996c2075b357a49c7
parentdffb1d5d2a8d8ecceda34c621ffc378e0cb6b859
parent15f629d28e1ec42c41102819dad8a7913229e1aa
Merge branch 'master' of webmasters.boum.org:wiki
wiki/src/blueprint/rewrite_Git_history.mdwn