Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Thu, 24 May 2012 18:07:05 +0000 (20:07 +0200)
committerMarco <marco@theanarchistlibrary.org>
Thu, 24 May 2012 18:07:05 +0000 (20:07 +0200)
commit38ad09a0efa52ac84f3f15718adc23c946aac170
tree42a89a60492863f880f75651631f4f3c23b4b1fc
parentec3153e8b190f3c86c160f860233c4ce654c50d6
parent1399f85adbb2d3a9a558538d051bd87b88227a9a
Merge branch 'master' into english