[geeklog-hg] geeklog: merging with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9001:817aae7b57c8
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/817aae7b57c8
user: Dirk Haun <dirk at haun-online.de>
date: Mon Mar 18 19:39:46 2013 +0100
description:
merging with upstream

diffstat:

 public_html/layout/denim/preferences/profile.thtml |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (15 lines):

diff -r cde155736a2d -r 817aae7b57c8 public_html/layout/denim/preferences/profile.thtml
--- a/public_html/layout/denim/preferences/profile.thtml	Sun Mar 17 13:33:24 2013 +0100
+++ b/public_html/layout/denim/preferences/profile.thtml	Mon Mar 18 19:39:46 2013 +0100
@@ -56,10 +56,9 @@
         <dd><input type="text" maxlength="96" value="{email_value}" name="email_conf" id="profile-email_conf" class="size6"{xhtml}></dd>
 
         {current_password_option}
-
-        {delete_account_option}
       </dl>
     </div>
+    {delete_account_option}
   </fieldset>
 </div>