From: Luke Howard <lukeh@padl.com>
Date: Wed, 30 Mar 2011 11:31:51 +0000 (+1100)
Subject: Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/cyrus-sasl
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=cyrus-sasl.git;a=commitdiff_plain;h=69e749f356bdda68f112889f675a00a18d6a9dc3

Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/cyrus-sasl
---

69e749f356bdda68f112889f675a00a18d6a9dc3
diff --cc .gitignore
index 489d613,e2a19d2..1897701
--- a/.gitignore
+++ b/.gitignore
@@@ -5,11 -3,13 +3,9 @@@ config.cach
  config.log
  config.status
  config.h
- depcomp
  
 -libtool
 -ltmain.sh
 -missing
 -
  .DS_Store
  
- Makefile.in
  Makefile
  
  *.la