Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 20 Oct 2013 09:00:24 +0000 (11:00 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 20 Oct 2013 09:00:24 +0000 (11:00 +0200)
commit2693d8fa5b4702304f34f21f6eedbdf36ef2c456
tree57295cf01b2eed0c63f88d31bdd90d97f351cce1
parentf20ee2a3d1399963a09197ef2ba9c2d2f0074ea7
parent7ce0044ffd6c2bc36ed7b78f5fc4a42e4ba7f8cd
Merge branch 'master' into english