Merge branch 'master' into macedonian macedonian
authorMarco <marco@theanarchistlibrary.org>
Tue, 24 Dec 2013 10:25:57 +0000 (11:25 +0100)
committerMarco <marco@theanarchistlibrary.org>
Tue, 24 Dec 2013 10:25:57 +0000 (11:25 +0100)
commit6e20b2aa1d80b4f1cdfe9533ef94304ee900ccb5
tree54ba87c98a39f5b18256cf557ee725005851a279
parent441a040a67fac0dc586d3eb671a62c36295f4191
parent4b1e2f91fb9b539a588de8a096546aad7456f0a7
Merge branch 'master' into macedonian

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