Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Sun, 20 May 2012 16:40:00 +0000 (18:40 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 20 May 2012 16:40:00 +0000 (18:40 +0200)
commit2ae13ec49b5977e065c2775ea53531acd6f0f512
treea3017ee2d22fc42ab2fed995b26576d512ff908e
parent7b131bf7289bc6c81c18083516673b9ff2cd7535
parent185398bd5601c23254f5000061f1c1f7066c95fc
Merge branch 'master' into finnish