Merge branch 'bug-978' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:21:00 +0000 (18:21 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:21:00 +0000 (18:21 +0100)
Signed-off-by: Benny Baumann <BenBE@geshi.org>
1  2 
includes/account.php
includes/account_stuff.php

@@@ -16,7 -16,7 +16,8 @@@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
        require_once("../includes/loggedin.php");
 +      require_once("../includes/lib/l10n.php");
+       require_once('lib/check_weak_key.php');
  
        loadem("account");
  
Simple merge