tree 25e4159631858f7cd871fbdc21d9e7fe5e21f09d
parent b39e4d6a6002bdd66ec72a8553a43830590399f7
parent 640b95cf1b26795e2cb6013499f0d59be4dc0767
author Dave Borowitz <dborowitz@google.com> 1379525191 -0700
committer Dave Borowitz <dborowitz@google.com> 1379525697 -0700

Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Remove documentation links from admin page
  NPE when deleting draft patch set when previous draft already deleted
  Fix example for 'test-submit rule' in Prolog cookbook

Change-Id: Ib96358c1fe6a953d17e88fd9f5bd4832fd51334a