Merge branch 'master' into hrvatski
authorMarco <marco@theanarchistlibrary.org>
Thu, 17 May 2012 08:57:34 +0000 (10:57 +0200)
committerMarco <marco@theanarchistlibrary.org>
Thu, 17 May 2012 08:57:34 +0000 (10:57 +0200)
commit10b7f11061f5ec6f56f951d373a331a73c119d96
tree3c7273820c08a91cc687caff3b0cf82a773655dd
parentbbe49a6c4620ea2af6d5eb21aa50ac4bbb6ccf38
parentc08916a6036bbb10564aaaddfcf488ed344591a1
Merge branch 'master' into hrvatski

Conflicts:
templates/html.tt
templates/html.tt
templates/merge.body.tt
templates/static-indexes/head.tt
templates/tex.tt