Merge branch 'maint' into java-work
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 18 Sep 2011 14:21:04 +0000 (16:21 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 18 Sep 2011 14:21:04 +0000 (16:21 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge