Merge branch 'device' into develop
authorPaul Brossier <piem@piem.org>
Tue, 15 Oct 2013 17:07:15 +0000 (19:07 +0200)
committerPaul Brossier <piem@piem.org>
Tue, 15 Oct 2013 17:07:15 +0000 (19:07 +0200)
1  2 
wscript

diff --cc wscript
Simple merge