Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Thu, 30 Aug 2012 16:42:33 +0000 (18:42 +0200)
committerMarco <marco@theanarchistlibrary.org>
Thu, 30 Aug 2012 16:42:33 +0000 (18:42 +0200)
commit5018c648dfe657e89c1d074fab965a5648ae664f
tree9ed55c7dfff1992b672be715d967f97da5c1c3f7
parent4e50e4932a8416cdcf2035ca37d034007475b199
parentb02546cf6aaa6429339db59920b662f458634872
Merge branch 'master' into english