Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Sun, 6 May 2012 16:40:20 +0000 (18:40 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 6 May 2012 16:40:20 +0000 (18:40 +0200)
commit064d8ac2374096417a5aec9f97094820e27356fe
treeb63a1437021d7e539da3e34365096c17c586e5ed
parent58ccdad6ae3bc2aec3149a8844a4ecc5cc56455c
parent5bc5d9dee257b74d65b6155479c05708136197ca
Merge branch 'master' into russian

Conflicts:
AmuseWiki/views/layouts/main.tt
14 files changed:
AmuseWiki/views/bookbuilder.tt
AmuseWiki/views/bookbuilderstatus.tt
AmuseWiki/views/editspecial.tt
AmuseWiki/views/error.tt
AmuseWiki/views/layouts/main.tt
AmuseWiki/views/login.tt
AmuseWiki/views/newentry.tt
AmuseWiki/views/page.tt
AmuseWiki/views/postform.tt
AmuseWiki/views/search.tt
AmuseWiki/views/singletitles.tt
AmuseWiki/views/singletopics.tt
AmuseWiki/views/special.tt
AmuseWiki/views/titles.tt