Merge branch 'master' into spanish spanish
authorMarco <marco@theanarchistlibrary.org>
Tue, 24 Dec 2013 10:21:14 +0000 (11:21 +0100)
committerMarco <marco@theanarchistlibrary.org>
Tue, 24 Dec 2013 10:21:14 +0000 (11:21 +0100)
commit23e9b89b3e1ecbe6a669ef0ad58b257be3e064bc
treee916a9e785e22959e21f7169509a67fe3dce9e10
parentf54c6dd9ef7fb91d49cf60fc618750e95d32b434
parent4b1e2f91fb9b539a588de8a096546aad7456f0a7
Merge branch 'master' into spanish

Conflicts:
AmuseWiki/views/layouts/main.tt
AmuseWiki/views/postform.tt
AmuseWiki/views/layouts/main.tt
AmuseWiki/views/newentry.tt
AmuseWiki/views/postform.tt