Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Thu, 23 Aug 2012 15:53:05 +0000 (17:53 +0200)
committerMarco <marco@theanarchistlibrary.org>
Thu, 23 Aug 2012 15:53:05 +0000 (17:53 +0200)
commit61e38713bcc35c24eafef3d70c4998f959bfc26d
tree8cc52b24e54c8fbe4752a24ca180b943ce4f5e5f
parentfe79a7b5d9e539bcb8ae223645eea87a0233733e
parent5198f8c4344ea63e738586340ea8c40148abfeef
Merge branch 'master' into english