From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 11 Jan 2011 01:35:38 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85eea96a3159c41b6630fd26d6f090484a131460;p=thirdparty%2Fautomake.git

Merge branch 'maint'

Conflicts:
	ChangeLog

Apparently I messed up doing a previous 'git pull', so that the "latest"
maint I've merged into master (and pushed!) wasn't a fast-forward from
origin/maint.  Yay for me.  This merge should help cleaning up the mess.
---

85eea96a3159c41b6630fd26d6f090484a131460
diff --cc ChangeLog
index 57c42413d,1ec0355f2..8c5a8f4da
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,5 +1,14 @@@
++2011-01-09  Peter Rosin  <peda@lysator.liu.se>
++
++	Fix another typo in Rule.pm comment.
++	* lib/Automake/Rule.pm: Fix typo.
++
  2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 +	tests: texinfo unrecognized extensions
 +	* tests/txinfo-unrecognized-extension.test: New test.
 +	* tests/Makefile.am (TESTS): Update.
 +
  	Improve, extend and tweak tests on Texinfo support.
  	* tests/instdir-texi.test: Add a call to `ls -l' after that to
  	`make', for debugging.  When looking for required tools, do not