Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Fri, 28 Sep 2012 14:20:03 +0000 (16:20 +0200)
committerMarco <marco@theanarchistlibrary.org>
Fri, 28 Sep 2012 14:20:03 +0000 (16:20 +0200)
commit254a3c5cda86a97fb6fb57b5836fb81a6bde8a65
treebaef1da0099ff4121e7afdb36d27968b85d492a3
parente0c535156b3597dcbfc3415beed0f7ecd245cbe2
parentfe954b4e8b95f09844583aabf3d958bdbe61af60
Merge branch 'master' into finnish

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