Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Thu, 30 Aug 2012 16:42:35 +0000 (18:42 +0200)
committerMarco <marco@theanarchistlibrary.org>
Thu, 30 Aug 2012 16:42:35 +0000 (18:42 +0200)
commite0c535156b3597dcbfc3415beed0f7ecd245cbe2
tree37ff6a23b92c9c7c7bffb5fc2493c5714c48a7b9
parentbf04c1faca554a1f396cfadb7193469f0c31d16c
parentb02546cf6aaa6429339db59920b662f458634872
Merge branch 'master' into finnish