Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Thu, 21 Jun 2012 07:51:39 +0000 (09:51 +0200)
committerMarco <marco@theanarchistlibrary.org>
Thu, 21 Jun 2012 07:51:39 +0000 (09:51 +0200)
commit3d33c8991aedf29f347aa4b287893918fbb2d88c
treecd7c64bb450b126a4015f564dfb4573b896f9a7a
parentd948750ac4dd9d7b388200656cb192b480a96be9
parent07cf4e9fdb426b1cb6125918b81c5ea716895bc3
Merge branch 'master' into russian

Conflicts:
templates/merge.head.tt

modified:   AmuseWiki/config.yml
modified:   AmuseWiki/lib/AmuseWiki.pm
modified:   AmuseWiki/views/bookbuilder.tt
modified:   templates/merge.head.tt
AmuseWiki/config.yml
AmuseWiki/views/bookbuilder.tt
templates/merge.head.tt