Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-09-23 0c144b98a417d50b9c073ae3931fdad47390f1f7

 program/steps/settings/func.inc

@@ -667,7 +667,7 @@
      $select_abook = new html_select(array('name' => '_default_addressbook', 'id' => $field_id));

      foreach ($books as $book) {
        $select_abook->add($book['name'], $book['id']);
        $select_abook->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
      }

      $blocks['main']['options']['default_addressbook'] = array(