[zanata/zanata] 94e279: add duplicate rewrite rule to work around paramete...

[GitHub]

  Branch: refs/heads/okapi-filters
  Home:   https://github.com/zanata/zanata
  Commit: 94e279587cb567d11308df2568f96dff27d647cd
      https://github.com/zanata/zanata/commit/94e279587cb567d11308df2568f96dff27d647cd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml

  Log Message:
  -----------
  add duplicate rewrite rule to work around parameter order issue


  Commit: 74d21f6698a1beb2f714a181e5a56618fdca6ca4
      https://github.com/zanata/zanata/commit/74d21f6698a1beb2f714a181e5a56618fdca6ca4
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml

  Log Message:
  -----------
  Merge branch 'master' into okapi-filters

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
		kept updated files outbound rule and new source_files outbound rule


Compare: https://github.com/zanata/zanata/compare/8035432f2c4f...74d21f6698a1