tree f5ccd1b95c0befa615fbf537ce03b050c8fe570b
parent b3d7cd9fdaae0a7b2650119ccd5ce60dab931f66
parent f252f5348e675c29cbeef3a44b756c80cf3e98cc
author Shawn Pearce <sop@google.com> 1371835220 -0700
committer Shawn Pearce <sop@google.com> 1371835220 -0700

Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Gerrit 2.6