Merge branch 'master' into finnish
authorMarco <marco@theanarchistlibrary.org>
Thu, 21 Jun 2012 08:31:55 +0000 (10:31 +0200)
committerMarco <marco@theanarchistlibrary.org>
Thu, 21 Jun 2012 08:31:55 +0000 (10:31 +0200)
commitaf6e81e6a81faeee8d9b928a1b20b19ee8be69bb
treeb48ae8815bd43fbc98ce24b869def70d7300f59b
parentf12ae6121723bcf8a023e29e42869c22335071c1
parent6544b90b87c22b1b8ce9da0ffe5bea057a382910
Merge branch 'master' into finnish

Conflicts:
AmuseWiki/views/bookbuilderstatus.tt
AmuseWiki/views/bookbuilderstatus.tt