Merge branch 'html5as' of http://git.erp5.org/repos/slapos into html5as
authorThomas Lechauve <gnon@tiolive.com>
Fri, 24 Aug 2012 12:44:21 +0000 (14:44 +0200)
committerThomas Lechauve <gnon@tiolive.com>
Fri, 24 Aug 2012 12:44:21 +0000 (14:44 +0200)
commit506ef1f1faf4bd2c26fe9180ad6561e2b0b4064b
tree8c492931db582425d5fb8720b566c6b6c7377cfc
parent05ebee93777325c8c078b87e9480d2ec88ebf66f
parent1b41ecf62ff27ebdacc92555c1546442a5e92526
Merge branch 'html5as' of git.erp5.org/repos/slapos into html5as