tree 207192d04e830dd836decc4b094e6a16c2a64a15
parent 98cd151eb122435eecec3c22b84ef145d58f1d5b
parent 57b44b0cd9491af415097bf195ef695d45bd9786
author Shawn Pearce <sop@google.com> 1368462102 -0700
committer Shawn Pearce <sop@google.com> 1368462102 -0700

Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Add statement about source code availability for Prolog Cafe
  Clarify that we consume Prolog Cafe under the EPL