tree a7982b80d0b2a4b4c9ecfd4c8157679a0bd6c713
parent 33476285103487fd57f95aa8879f1de0e9460537
parent 6b12b35d2a6aa151e9cafe9a052b5f6f2ced7211
author Dave Borowitz <dborowitz@google.com> 1379533910 -0700
committer Dave Borowitz <dborowitz@google.com> 1379533922 -0700

Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Fix installation of plugins

Change-Id: I6742a5cd3417633be2ad8347f8ebea2fdcc07b88