commit db9f633b6d123aefef6d5efeb8605517a7d5759d Merge: 849bfc0 94d70d5 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 9 14:43:36 2011 -0500

Merge remote-tracking branch 'chiiph/ignoreconfig'

lib/thandy/packagesys/ThpPackages.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)