Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Sat, 19 May 2012 16:12:20 +0000 (18:12 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sat, 19 May 2012 16:12:20 +0000 (18:12 +0200)
commit7b131bf7289bc6c81c18083516673b9ff2cd7535
tree7ea77a96a2c53f434f44f5f7c9f58b24a853e95b
parent9e393e576a44bc6a660515a7808895403da8c88c
parent59df90bca9393772442ae4595a3121107def4021
Merge branch 'master' into finnish

Conflicts:
AmuseWiki/views/search.tt
AmuseWiki/views/bookbuilder.tt
AmuseWiki/views/layouts/main.tt
AmuseWiki/views/newentry.tt
AmuseWiki/views/postform.tt
AmuseWiki/views/search.tt