Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Thu, 23 Aug 2012 16:44:57 +0000 (18:44 +0200)
committerMarco <marco@theanarchistlibrary.org>
Thu, 23 Aug 2012 16:44:57 +0000 (18:44 +0200)
commit959f6be90fe99e1659e7b3a35aae8f9891a3396e
tree748dac49627f835699b369776acad913afc7cd5c
parentac95131c7e275ccb0e3e3c1a6383e71aa15c86fa
parent5198f8c4344ea63e738586340ea8c40148abfeef
Merge branch 'master' into russian

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