Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Sun, 29 Apr 2012 19:19:00 +0000 (21:19 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 29 Apr 2012 19:19:00 +0000 (21:19 +0200)
commitb60ca33a3ddd9b60758ffeccc80b32f433b066df
treea548ae0c58ecb71485841677eef25d5248e03dd9
parent6226574b6936582dad5bb599a835c8a33cfd17ce
parent07c2d34212387c9670849e38e6fed2baa669e251
Merge branch 'master' into russian

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