Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Sat, 25 Aug 2012 08:34:56 +0000 (10:34 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sat, 25 Aug 2012 08:34:56 +0000 (10:34 +0200)
commit224db3a51fcf367fc1c658b0e80721344f4995b6
treed961b8c4b7180a112139155ec0a8694065788ff5
parent80017a693aa6d89e0b0cd125a353364a00796015
parenta0f169653d9806eccb684a10602ee2223485df6e
Merge branch 'master' into russian