Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Sat, 19 May 2012 16:13:43 +0000 (18:13 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sat, 19 May 2012 16:13:43 +0000 (18:13 +0200)
commitadb9ba3966874380e1ef89e630d0366ba59ef5f7
tree71d3cfba6e8fee051ff73cdbff6945f61e0ec1ca
parent38561d1789f9d076d592127c0076aea9b1a8a690
parent59df90bca9393772442ae4595a3121107def4021
Merge branch 'master' into russian

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