Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Mon, 24 Dec 2012 14:41:22 +0000 (15:41 +0100)
committerMarco <marco@theanarchistlibrary.org>
Mon, 24 Dec 2012 14:41:22 +0000 (15:41 +0100)
commitc295f38a24477f31ace9dc8a40cb4f74ce00cdbb
tree7b0900f323be8207d0b4d77a078be329829ab27c
parentfedb811d95009bceca2e280f278f05073d101638
parente267fb13266ce15557d1bc1654ddc0d28cfb1664
Merge branch 'master' into english