Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Sun, 29 Apr 2012 19:23:31 +0000 (21:23 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 29 Apr 2012 19:23:31 +0000 (21:23 +0200)
commitd7e74470a4a8dee2252422767eed88dee6299295
tree7d5c804db22d4286c0b7a15a88227fd4be75df78
parent65ebb4253d13039fae558b88e83248c5ef2be3f9
parent07c2d34212387c9670849e38e6fed2baa669e251
Merge branch 'master' into finnish

Conflicts:
AmuseWiki/views/search.tt
AmuseWiki/public/css/style.css
AmuseWiki/views/layouts/main.tt
AmuseWiki/views/search.tt