Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 20 Oct 2013 08:57:17 +0000 (10:57 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 20 Oct 2013 08:57:17 +0000 (10:57 +0200)
commitf20ee2a3d1399963a09197ef2ba9c2d2f0074ea7
tree4a53a867c7c4b49804e9daa2d522a4c2221ec7fb
parentcc253029c000d8bd0e2aeb7b7014c07c948f17b6
parent5bbf590bb05fe91979ea74713b78e6584fa4d24e
Merge branch 'master' into english