Merge commit 'origin/platal-0.10.1'
authorVincent Zanotti <vincent.zanotti@m4x.org>
Thu, 6 Aug 2009 17:01:13 +0000 (19:01 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Thu, 6 Aug 2009 17:01:13 +0000 (19:01 +0200)
Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
1  2 
htdocs/javascript/xorg.js

Simple merge