tree 89ac8fbfe543d8b54d6bbe98a6824384b1130831
parent 28d5fe0209b66683813c92b31312b716d551b7fc
parent 09a35b97254f84624775f15283aa6bffaadcda70
author Shawn Pearce <sop@google.com> 1376333836 -0700
committer Shawn Pearce <sop@google.com> 1376333836 -0700

Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Fix Gerrit plugins under Tomcat by avoiding Guice static filter