Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sat, 4 May 2013 18:15:59 +0000 (20:15 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sat, 4 May 2013 18:15:59 +0000 (20:15 +0200)
commit9151d39ebed78cb5f3bf53ae98db554868ed3330
treedd5a76b7f8fc7e1165e5c0bd5d462f5df865d50d
parent1329a87d3edf9c183875fc359de47efd3de071dc
parent19c43ae3adb1ab361651eb2fbda5ce947da503b3
Merge branch 'master' into english