Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Fri, 21 Dec 2012 10:05:18 +0000 (11:05 +0100)
committerMarco <marco@theanarchistlibrary.org>
Fri, 21 Dec 2012 10:05:18 +0000 (11:05 +0100)
commitf459a87b2fe1092d9d3736a24caefd09267cc01e
treea2c1cd67a448748b3d5baa3a912b73c239db7d0f
parent0ef26eda01771f5702ebf8854b85b3e046e8b9e6
parent661c4b8a5a437971ebb67088f15f2e883df3ba71
Merge branch 'master' into english