Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 20 Oct 2013 09:07:12 +0000 (11:07 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 20 Oct 2013 09:07:12 +0000 (11:07 +0200)
commit515a65757778cf287d5c836256f4856132c4933a
tree1616bf4bd28dce91efcc70f0dc0fd88f172acd18
parent2693d8fa5b4702304f34f21f6eedbdf36ef2c456
parentb9016eed8d1af620061a7d3de34bd52cffe1eb0d
Merge branch 'master' into english