Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 20 Oct 2013 08:53:50 +0000 (10:53 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 20 Oct 2013 08:53:50 +0000 (10:53 +0200)
commitcc253029c000d8bd0e2aeb7b7014c07c948f17b6
tree4f5216915b4b522fe5d0cff6c07a6b3ccf8ca86c
parent77b56311515fd625af29f515f40148ad21adcf4e
parent15e676770e3a50d8483ddb19fa87385445d4032c
Merge branch 'master' into english