Merge branch 'maint' into branch-1.11
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 17 Apr 2011 10:43:33 +0000 (12:43 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 17 Apr 2011 10:43:33 +0000 (12:43 +0200)
1  2 
ChangeLog
m4/amversion.m4

diff --cc ChangeLog
Simple merge
diff --cc m4/amversion.m4
Simple merge