Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Sun, 6 May 2012 16:38:00 +0000 (18:38 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 6 May 2012 16:38:00 +0000 (18:38 +0200)
commit60bf1796afcaf1d1ec3f94fd8f5fa3da1509321b
tree5ea1a1bab9baf96f8f58489f916d1266bd482c74
parent68a5a22157b486678c45d26349774eac17c4b5dc
parent5bc5d9dee257b74d65b6155479c05708136197ca
Merge branch 'master' into finnish

Conflicts:
AmuseWiki/views/layouts/main.tt
AmuseWiki/views/search.tt
13 files changed:
AmuseWiki/views/bookbuilder.tt
AmuseWiki/views/bookbuilderstatus.tt
AmuseWiki/views/editspecial.tt
AmuseWiki/views/error.tt
AmuseWiki/views/gitlog.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/special.tt