Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 30 Apr 2014 19:58:13 +0000 (21:58 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 30 Apr 2014 19:58:13 +0000 (21:58 +0200)
commit328800d5363fb3a7e5c39f17f99d52abc38f7dc6
tree1d209caa64d0002f6b66c52be77819138521620a
parent62e920b7729b844eeff8255babb17191729f7e4b
parent1fd890f5a0bdb874f7e2ba50874ae509a856f16c
Merge branch 'erp5-component' into erp5