tempy
tempy merge

Conflicts:

tmp/templates_c/931e1e9eac676a7613090088c9d8b4df6c1f1c50.tpl_head.24.php

tmp/templates_c/ad83cfdd496e0d74150f5e8179bf0ea1e88e3ac2.tpl_body.24.php
	tmp/templates_c/f38a13506d3ed3158f13dfc7e3c9098b848aa65a.tpl_top.24.php