# HG changeset patch
# User casties
# Date 1412084795 -7200
# Node ID 66f86cb8f69b9dda54524cc3cbf9aa0e090eb794
# Parent  d672a6f6c9029a93614d45aa5c0f5e4b977f7a87# Parent  690d5dea34bdb7404561c30a2a8d000ffa36f4d2
Merge with default
690d5dea34bdb7404561c30a2a8d000ffa36f4d2

diff -r d672a6f6c902 -r 66f86cb8f69b zpt/www/main_template.zpt