[zanata-commits] [zanata/zanata] dfc0da: Merge branch 'rhbz749437' into rhbz750673, impleme...

[noreply at github.com]

  Branch: refs/heads/rhbz750673
  Home:   https://github.com/zanata/zanata

  Commit: dfc0da2bf89148f87b0009ef5a5973a37f87bb80
      https://github.com/zanata/zanata/commit/dfc0da2bf89148f87b0009ef5a5973a37f87bb80
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-03 (Thu, 03 Nov 2011)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
  M server/zanata-war/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
  M server/zanata-war/src/main/java/org/zanata/action/SlugHome.java
  A server/zanata-war/src/main/java/org/zanata/security/BaseSecurityChecker.java
  A server/zanata-war/src/main/java/org/zanata/security/SecurityChecker.java
  M server/zanata-war/src/main/resources/security.drl
  M server/zanata-war/src/main/webapp/language/language.xhtml
  M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Merge branch 'rhbz749437' into rhbz750673, implement drl rules for 'mark-obsolete' action.

Conflicts:
	server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml