Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 26 Aug 2012 09:05:25 +0000 (11:05 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 26 Aug 2012 09:05:25 +0000 (11:05 +0200)
commit4e50e4932a8416cdcf2035ca37d034007475b199
tree18e51a0457f574e2599d28b125102c61032301ff
parentcefc1c2db81cc39065e8e76026dc55865d874ebc
parent5db022bdf514f972bd4857886bf827b1307ec033
Merge branch 'master' into english