Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorGuillaume Bury <guillaume.bury@tiolive.com>
Thu, 19 Jul 2012 16:02:52 +0000 (18:02 +0200)
committerGuillaume Bury <guillaume.bury@tiolive.com>
Thu, 19 Jul 2012 16:02:52 +0000 (18:02 +0200)
commitbef61ec6ac9c90b9afc499fe5f5f89be21ce325a
treeae6bb9e5e247ac3058741bb9f6710d35e4c0197d
parent622530d9755c9e5f7435582ece11cc9f2aa27fad
parent2b83960432bd8e4ae9140e61b388079e22567aff
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
TODO
TODO