Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Tue, 24 Dec 2013 10:10:06 +0000 (11:10 +0100)
committerMarco <marco@theanarchistlibrary.org>
Tue, 24 Dec 2013 10:10:06 +0000 (11:10 +0100)
commita1600267dd3a4bf8e600c3fe5138fee0971999c3
tree649e39078586454a7528ed291c209979e1d4d2b9
parentadce870245be5c2d7ecd9d4515563334cf3b9502
parent4b1e2f91fb9b539a588de8a096546aad7456f0a7
Merge branch 'master' into english

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