[zanata/zanata] 6c97e1: Merge branch 'master' into rhbz803572

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: 6c97e151a24af8133060da1cdf701dc7fdc44907
      https://github.com/zanata/zanata/commit/6c97e151a24af8133060da1cdf701dc7fdc44907
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
  M server/zanata-war/src/main/webapp/account/activate.xhtml
  M server/zanata-war/src/main/webapp/account/changepassword.xhtml
  M server/zanata-war/src/main/webapp/account/login.xhtml
  M server/zanata-war/src/main/webapp/account/login_input.xhtml
  M server/zanata-war/src/main/webapp/account/logout.xhtml
  M server/zanata-war/src/main/webapp/account/password_reset.xhtml
  M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
  M server/zanata-war/src/main/webapp/account/register.xhtml
  M server/zanata-war/src/main/webapp/account/validate_email.xhtml
  M server/zanata-war/src/main/webapp/admin/glossary.xhtml
  M server/zanata-war/src/main/webapp/admin/home.xhtml
  M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
  M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/search.xhtml
  M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
  M server/zanata-war/src/main/webapp/admin/stats.xhtml
  M server/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
  M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
  M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
  M server/zanata-war/src/main/webapp/edit_home_content.xhtml
  M server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
  M server/zanata-war/src/main/webapp/error.xhtml
  M server/zanata-war/src/main/webapp/help/contact_admin.xhtml
  M server/zanata-war/src/main/webapp/help/edit_help_content.xhtml
  M server/zanata-war/src/main/webapp/help/view.xhtml
  M server/zanata-war/src/main/webapp/home.xhtml
  M server/zanata-war/src/main/webapp/iteration/edit.xhtml
  M server/zanata-war/src/main/webapp/iteration/files.xhtml
  M server/zanata-war/src/main/webapp/iteration/view.xhtml
  M server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
  M server/zanata-war/src/main/webapp/language/home.xhtml
  M server/zanata-war/src/main/webapp/language/language.xhtml
  M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
  M server/zanata-war/src/main/webapp/profile/edit.xhtml
  M server/zanata-war/src/main/webapp/profile/view.xhtml
  M server/zanata-war/src/main/webapp/project/add_iteration.xhtml
  M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
  M server/zanata-war/src/main/webapp/project/create_project.xhtml
  M server/zanata-war/src/main/webapp/project/edit.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  M server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
  M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Merge branch 'master' into rhbz803572