Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Fri, 13 Apr 2012 16:31:20 +0000 (18:31 +0200)
committerMarco <marco@theanarchistlibrary.org>
Fri, 13 Apr 2012 16:31:20 +0000 (18:31 +0200)
commit2b06bfbf93075a7de9fa5161874e434aba428947
tree3b180e6bc18ff57b94cf180ffde52bf7bfa5acb3
parent03fd790644a673d772db636a9eb799213a8aae42
parentda08fe1b7e83bd0e0807cab3ea6b331ed99a4b49
Merge branch 'master' into finnish

Conflicts:
AmuseWiki/views/newentry.tt
AmuseWiki/config.yml
AmuseWiki/views/newentry.tt