Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Fri, 27 Jul 2012 05:55:20 +0000 (14:55 +0900)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Fri, 27 Jul 2012 05:55:20 +0000 (14:55 +0900)
commit82df1543d2081219c65d2fb9b055371b4bccbc12
tree191a4bd27e9aef68e7d1a026071089d393f4563f
parent05ddb3f736e8ce0bff2482c8d5fc84eeb943f012
parentf475f2ca4ffc086e844699d472cd3c5e83330c37
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
TODO
TODO