Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Fri, 25 May 2012 09:31:25 +0000 (11:31 +0200)
committerMarco <marco@theanarchistlibrary.org>
Fri, 25 May 2012 09:31:25 +0000 (11:31 +0200)
commitc5396575c00c970a581aea9a68809242c420d9f6
tree6322f7c36305a2d1418a5776e41f5fd2a3457b3d
parent79d7629c78f2aa2f14da771d5c803200ad28536f
parent0d070bba492383ec75815946b8fb23b19c61297a
Merge branch 'master' into russian
templates/merge.head.tt
templates/tex.tt