Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Tue, 24 Dec 2013 10:16:50 +0000 (11:16 +0100)
committerMarco <marco@theanarchistlibrary.org>
Tue, 24 Dec 2013 10:16:50 +0000 (11:16 +0100)
commit0108e85b580a2dc0a372fd8bc29bf932aa52deeb
treeaf1a880e522efe1daaf4e982003d4100666f1a7d
parent9753882182bed18fc8e754b5c57c6c89f95592a7
parent4b1e2f91fb9b539a588de8a096546aad7456f0a7
Merge branch 'master' into finnish

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