Merge branch 'master' into amossys
authorYour Name <olivier.tetard@amossys.fr>
Mon, 28 Nov 2011 13:56:46 +0000 (14:56 +0100)
committerYour Name <olivier.tetard@amossys.fr>
Mon, 28 Nov 2011 13:56:46 +0000 (14:56 +0100)
commitb1e481a9d10a1344b1bac0c620fef8fe5fc44a73
tree8f9e5a1339d404299d70a3ad6d4c7b55ed19958a
parent7981b98ca4e516b85a98da22c143ff254be2b656
parentb2526ec7324de4a000035bea92e2e9c1cbeddf04
Merge branch 'master' into amossys