Merge branch 'master' into devel
commit7e7ef209fdfa8b871e5f21115d12aa68a69a4f7a
authorTails developers <amnesia@boum.org>
Wed, 8 Oct 2014 20:17:27 +0000 (8 22:17 +0200)
committerTails developers <amnesia@boum.org>
Wed, 8 Oct 2014 20:17:27 +0000 (8 22:17 +0200)
tree93ecce3f63fc5c68d894c523e4ce3d3dbacb5c29
parentef09c38b8164125b732f75414052cc989341fc54
parent96361f6c349ea64346e5da50a868dafbb2a9a80b
Merge branch 'master' into devel
wiki/src/contribute/design.mdwn
wiki/src/contribute/how/documentation/guidelines.mdwn