tree e63cc23c8e74ed7265622abffca52676a24b897f
parent c4a0f0c8f0a30ed30252000373bbb2a68d8481f6
parent 78c978e40741fdbd5103449a14a5b60614d6fcff
author Shawn Pearce <sop@google.com> 1376360981 -0700
committer Shawn Pearce <sop@google.com> 1376360981 -0700

Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Expand capabilities of ldap.groupMemberPattern