Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Mon, 30 Apr 2012 10:00:26 +0000 (12:00 +0200)
committerMarco <marco@theanarchistlibrary.org>
Mon, 30 Apr 2012 10:00:26 +0000 (12:00 +0200)
commit834f2d9ca062654fbcc6357b8d7130d5596975cb
tree6cb2b55e2bc6e1c024378f22e8be7e087ab0d157
parentd45c330051745550651dc20f73e47bc04a06ad18
parent01ee09fe6c1200cb6ada1b362d338efef1e521f6
Merge branch 'master' into finnish

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