Merge branch 'new-gui'
commita61054005a5173ed3ded3b75daf1fd578fffc69f
authorFrédéric Péters <fpeters@0d.be>
Sat, 6 Jun 2009 13:46:22 +0000 (6 15:46 +0200)
committerFrédéric Péters <fpeters@0d.be>
Sat, 6 Jun 2009 13:46:22 +0000 (6 15:46 +0200)
treef95ca2c398583c8e517484e2d335a5068175fff4
parentd71bce0a715b596e598502a83e6bd54959707f87
parent535bab71c2aaeda89872eee4556fad0a4310f9b1
Merge branch 'new-gui'