Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 29 Apr 2012 19:15:05 +0000 (21:15 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 29 Apr 2012 19:15:05 +0000 (21:15 +0200)
commitdc904f5c67c875f4bcd5a251cfb0be61160b8a43
treee5e5dbaf1f9370bca33bdebd772bfd84e8607333
parent2905170b47a4cfcecc166d886971e0fe24553845
parent07c2d34212387c9670849e38e6fed2baa669e251
Merge branch 'master' into english