Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 13 May 2012 17:19:10 +0000 (19:19 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 13 May 2012 17:19:10 +0000 (19:19 +0200)
commitfcbb87273a2523b00d9d88d2889c9a51d55c014b
treebccd7a7768ba718e92146cddf2d169926a20d12d
parent79d27667a1aa67061f0ea0c3195b41cf87741301
parent62fb620a9dde3ec433f214d8bafa0ac4491dc381
Merge branch 'master' into english