Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Sun, 6 May 2012 13:55:01 +0000 (15:55 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 6 May 2012 13:55:01 +0000 (15:55 +0200)
commit415dc1c676468ba67e76541f95905c4674e11833
treeec993f330c159b8e452b2cc78b088a196e62f4c7
parent31f7c5eb1752105f60228dad33b2852b246c3530
parent9eb147e3b8f084dfd140aa2dca4f43914bb09b9a
Merge branch 'master' into finnish

Conflicts:
AmuseWiki/views/bookbuilder.tt
AmuseWiki/views/error.tt
AmuseWiki/views/special.tt
AmuseWiki/views/bookbuilder.tt
AmuseWiki/views/editspecial.tt
AmuseWiki/views/error.tt
AmuseWiki/views/search.tt
AmuseWiki/views/special.tt