| commit | cd4f464a087a8710365a8aae8f147bc8d1339324 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Sat May 18 13:08:10 2013 -0700 |
| committer | Shawn Pearce <sop@google.com> | Sat May 18 13:08:10 2013 -0700 |
| tree | c149ba9ac100b9d3ddafbf09d8be93167da143d9 | |
| parent | d7d8b620ce8e5c06dd3ba3833ddd44179b436116 [diff] | |
| parent | 98100202d5fdf2be8edbbdd99b19392ebac508f2 [diff] |
Merge branch 'stable-2.5' into stable-2.6 * stable-2.5: Release notes for 2.5.4 Require preferred email to be a verified address Corrections in the 2.5.x release notes Conflicts: ReleaseNotes/ReleaseNotes-2.5.2.txt gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java Change-Id: I08731949f0e7a87604ca003b81e6dbe63678bd82