Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 13 May 2012 08:21:09 +0000 (10:21 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 13 May 2012 08:21:09 +0000 (10:21 +0200)
commitf13efaf71cad0ec622a99d4aa75dc42acd67545d
treee823ead71397e282df10eb3b3094ce685f630556
parentb5efb711e3b7212846525412064778e4de2d80be
parent09e87646d851105e1e174ace88ae795f916afce6
Merge branch 'master' into english