Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Thu, 17 May 2012 18:32:07 +0000 (20:32 +0200)
committerMarco <marco@theanarchistlibrary.org>
Thu, 17 May 2012 18:32:07 +0000 (20:32 +0200)
commit38561d1789f9d076d592127c0076aea9b1a8a690
treee762dca84f31b2388ffce1f50d2c8bbb70c69794
parentd5671f16a98c8b490b8ab88e2af0c3c082f0c293
parent366209f76e3d7b4850afddb2f50bd768fe0261b1
Merge branch 'master' into russian
templates/merge.body.tt
templates/merge.head.tt