From: W. Trevor King <wking@tremily.us>
Date: Sun, 20 Jan 2013 17:17:57 +0000 (-0500)
Subject: Merge remote-tracking branch 'wberrier/master' into master
X-Git-Tag: v0.1~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55890008d86301022263c9a4142cdd470ecc4072;p=mutt-ldap.git

Merge remote-tracking branch 'wberrier/master' into master

* wberrier/master:
  prevent an error when no search string is given
  Return partial results if the search takes a long time
  implement caching system for big/slow ldap servers
  make search fields configurable
  Add support for an optional display column
  Fix for python 2.6: add position indexes to format strings
  Add query filter section (in order to pare down results)
  Return results in a format that mutt expects
  fix typo in reference to .rc file
  Add Wade Berrier (me) to author/copyright list
---

55890008d86301022263c9a4142cdd470ecc4072