| commit | b4497fd7ce5f90b3accc09dcf4bfc631d12034a0 | [log] [tgz] |
|---|---|---|
| author | Dave Borowitz <dborowitz@google.com> | Mon Sep 30 11:11:24 2013 -0700 |
| committer | Dave Borowitz <dborowitz@google.com> | Mon Sep 30 11:13:10 2013 -0700 |
| tree | 206a5ef1124a3ee0b78b34debe192a2503ea4c99 | |
| parent | 8c5809d59cdd2adbe53e0290c7f5dc4f32cf8891 [diff] | |
| parent | 1d0673b5f4e46fa147941a4d5b6845a8e08ae8c5 [diff] |
Merge branch 'stable-2.6' into stable-2.7 * stable-2.6: Fix: Duplicate options of permitted_labels. Make links appear with the same color in Change UI Update revision of reviewnotes plugin Conflicts: plugins/reviewnotes Change-Id: Ib88f7163a15a6fefd0f30f7eacef7b576aa79ab1