Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Wed, 18 Jul 2012 09:50:10 +0000 (18:50 +0900)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Wed, 18 Jul 2012 09:50:10 +0000 (18:50 +0900)
commit11f6f9df4aed8f35cb460922e6767daeeef79151
treef367fa167c15d0d2d25e1f523642622fcdb79ed9
parent5d9fa24a465b29d0c4fbf9dfb15cf220a763802b
parentb7453ca87006c038b01c35aa7957bf207adfb148
Merge branch 'master' of https://git.erp5.org/repos/vifibnet