Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 4 May 2011 20:50:59 +0000 (22:50 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 4 May 2011 20:50:59 +0000 (22:50 +0200)
commit48a53a53adb6deb0246092befc0636b588e8d04d
tree4a308168345a5ca48ea1184f40732bbf29159967
parent0ab2e466557486162d83f9682c035f434a26bdac
parent293b93fcbe264c701ebb88bee5eee0dcf685ac38
Merge branch 'maint'
ChangeLog