Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Tue, 24 Dec 2013 10:32:00 +0000 (11:32 +0100)
committerMarco <marco@theanarchistlibrary.org>
Tue, 24 Dec 2013 10:32:00 +0000 (11:32 +0100)
commit7ccbac48f16e5519107f9c143d6a00d9b44cc9b2
treedcb99a65b2d45daaed19fcd3a2a7a7804ec79855
parentd997328d4eba3f3735416ca5a4f09e5ba108aaaa
parent4b1e2f91fb9b539a588de8a096546aad7456f0a7
Merge branch 'master' into russian

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