Merge remote-tracking branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 19 Jun 2013 08:04:22 +0000 (10:04 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 19 Jun 2013 08:04:22 +0000 (10:04 +0200)
commit0b8be139fac1d567cb5525bdbc72a486c8d13745
tree226f840d13e22a84193e87a03a2c92ac56d4d851
parent5b0853494294fc861f2a0f4ccab2dca49147550d
parent7ac340d6abf9357bd71baa6047c354bd21e0576a
Merge remote-tracking branch 'master' into erp5-component