Merge branch 'master' into erp5
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 29 Mar 2012 16:54:13 +0000 (18:54 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 29 Mar 2012 16:54:13 +0000 (18:54 +0200)
commit9fe0f91f43963f6eeeff96a3602866e53590c133
treee897e29ed7a2abbeff78cd555a5704fa119eb6ee
parent990f2f37cfc57838f749908a694af2c7d34df32d
parentf90212bf5d03b473d90477281452aad04f50d716
Merge branch 'master' into erp5
setup.py