Merge branch 'maint' into branch-1.11
commit917e1e8946e964c71370f89445c758c000457658
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Mon, 18 May 2009 21:03:45 +0000 (18 23:03 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Mon, 18 May 2009 21:03:45 +0000 (18 23:03 +0200)
tree7f58e4a3bb5f26e366139551281822f5833efc68
parent2c691754f3afaf4d4f5d3a11a08aa1e68c429b6e
parent23aa3dbbf5d5a28a33604599eb4f848f293e9933
Merge branch 'maint' into branch-1.11
ChangeLog