Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Mon, 30 Apr 2012 14:48:55 +0000 (16:48 +0200)
committerMarco <marco@theanarchistlibrary.org>
Mon, 30 Apr 2012 14:48:55 +0000 (16:48 +0200)
commit8370b3e8d9ec7776d473b5a4d27b5532191c479b
treee5ba47207d31b5005381d8d40a32405e6cbceaba
parent8beba0c532b3b2fbaa0261115a365abd73ed0732
parent79b85522b137249585ce74c5e853b716311c7229
Merge branch 'master' into english