Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Fri, 20 Jul 2012 08:27:43 +0000 (17:27 +0900)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Fri, 20 Jul 2012 08:27:43 +0000 (17:27 +0900)
commit3825276fd298319b7443c85a7c9d10bac06b1565
tree09562965fe58c548c4e7673b8379fa97ac32e9f7
parent5086a20aa3887133165ab669d7c88618dc5275d4
parentef42f40f23ed3e738bc23b5bab1216401540e6a7
Merge branch 'master' of https://git.erp5.org/repos/vifibnet