From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 21 Dec 2009 21:24:37 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~450
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b67ee443339114df67f64ace6b28c7adde4f4965;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

b67ee443339114df67f64ace6b28c7adde4f4965
diff --cc ChangeLog
index a91561f36,6edf59e00..399a33e60
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,15 +1,19 @@@
+ 2009-12-21  Julien Danjou  <julien@danjou.info>  (tiny change)
+ 
+ 	Add support for newer python version
+ 	* m4/python.m4 (AM_PATH_PYTHON): Add python3.1 to
+ 	_AM_PYTHON_INTERPRETER_LIST.
+ 
+ 2009-12-21  Karl Berry  <karl@freefriends.org>
+ 
+ 	mention ncftpput in gnupload --help
+ 	* lib/gnupload: Mention ncftpput in `--help' output.
+ 	Report by Bruce Korb.
+ 
 +2009-12-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +	* NEWS: Update.
 +
  2009-12-05  Antonio Diaz Diaz  <ant_diaz@teleline.es>
  
  	Replace unlzma, gunzip, bunzip2 with pack tool -d invocation.