Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Fri, 20 Jul 2012 09:44:33 +0000 (18:44 +0900)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Fri, 20 Jul 2012 09:44:33 +0000 (18:44 +0900)
commit767e6793b1637f9e9121a3400a907ebbaaaf9c01
tree9add664a3bf7c20ce3d34165775921b9de06aa81
parent17d121a8bf04eb43239b6d9437ab0392fb0fc84d
parent49685121572a5bc88ee32854cace809c82adbb10
Merge branch 'master' of https://git.erp5.org/repos/vifibnet