merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -0,0 +1,7 @@
<load target="css/msignup.css" usecdn="true" />
<div>
<div class="hx h2"><h2>{$lang->cmd_find_member_account}</h2></div>
<p>{$lang->about_temp_password}</p>
<p><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->: {$user_id}</p>
<p>{$lang->temp_password}: {$temp_password}</p>
</div>