Merge branch 'html5as' of http://git.erp5.org/repos/slapos into html5as
authorThomas Lechauve <gnon@tiolive.com>
Fri, 24 Aug 2012 14:14:07 +0000 (16:14 +0200)
committerThomas Lechauve <gnon@tiolive.com>
Fri, 24 Aug 2012 14:14:07 +0000 (16:14 +0200)
commit3e01dcb2ff422897fe9e53377b26f5c3e942daf1
tree8230bd67f7cb04540e9bed280bf8e6075e48004b
parentd305ad7244baec0f99b0145331bcf3f00846abb8
parentc4e675a42ff4143a3bc945326c418f3dc2911b21
Merge branch 'html5as' of git.erp5.org/repos/slapos into html5as
software/html5as/software.cfg