Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Sun, 8 Jul 2012 09:49:22 +0000 (11:49 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 8 Jul 2012 09:49:22 +0000 (11:49 +0200)
commit716f6fed6e9bb483e916810fde0e682758242c0e
tree0d2fbb565f651c7a3d4ab817d4bc8eb65060fc09
parentab7999b9d2dd5ff9c8caf60447c2904bd2069cda
parente9fb87e0b8dce29bbe694a71f77008f15ca7f854
Merge branch 'master' into russian
templates/merge.head.tt