| commit | b39e4d6a6002bdd66ec72a8553a43830590399f7 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Sat Aug 31 18:14:56 2013 -0700 |
| committer | Shawn Pearce <sop@google.com> | Sat Aug 31 18:14:56 2013 -0700 |
| tree | 646d1866d5a03376a150e8a867b0fbe432d72ab8 | |
| parent | 6a25f558dcde03c0ad13c196cce71b1a6bad8889 [diff] | |
| parent | bae9e58ddd68992473307787fb01e022f5969fee [diff] |
Merge branch 'stable-2.6' into stable-2.7 * stable-2.6: Fix reenabling of plugins