Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sat, 25 Aug 2012 08:34:51 +0000 (10:34 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sat, 25 Aug 2012 08:34:51 +0000 (10:34 +0200)
commitcefc1c2db81cc39065e8e76026dc55865d874ebc
tree33e9777a18db3b7722501906be596501a42504df
parent4c6bebf4c4562040a2db83869bb6db51c9060ca6
parenta0f169653d9806eccb684a10602ee2223485df6e
Merge branch 'master' into english