Merge branch 'html5as' of https://git.erp5.org/repos/slapos into html5as
authorThomas Lechauve <gnon@tiolive.com>
Wed, 22 Aug 2012 10:07:58 +0000 (12:07 +0200)
committerThomas Lechauve <gnon@tiolive.com>
Wed, 22 Aug 2012 10:07:58 +0000 (12:07 +0200)
commitf098e6c194a4d7ff76468da93111fbbfb05154ad
tree6ec1f1105445d8366d206e7f3b4e5024755e773a
parent8fe564288505fe3f8208c7f2122d37961ac5233e
parent3a5af987b4540017e7d8221cfb235f8066177762
Merge branch 'html5as' of https://git.erp5.org/repos/slapos into html5as