Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorGuillaume Bury <guillaume.bury@tiolive.com>
Wed, 18 Jul 2012 09:56:48 +0000 (11:56 +0200)
committerGuillaume Bury <guillaume.bury@tiolive.com>
Wed, 18 Jul 2012 09:56:48 +0000 (11:56 +0200)
commit6d265f44d76fc2b1834c628034c2758377165166
tree7cae234e285cf17f4493f435ffa8df87bdd2305d
parent91efc5b5c135018bb1053a8d61fb95e07f03455f
parent11f6f9df4aed8f35cb460922e6767daeeef79151
Merge branch 'master' of https://git.erp5.org/repos/vifibnet