Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 6 May 2012 08:52:00 +0000 (10:52 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 6 May 2012 08:52:00 +0000 (10:52 +0200)
commit24d02c45d362f6d34039bb8d4fcbf0fe0e5efed7
tree269044912042d31d617587b52ad160f54fa298d3
parent21b2b88c9cf6d981e35d167beb374e86a0c43c5b
parent9ce81803cb4c79bdf765b8dc1e95e2058616d5e6
Merge branch 'master' into english