Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 28 Apr 2014 20:24:39 +0000 (22:24 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 28 Apr 2014 20:24:39 +0000 (22:24 +0200)
commit5e7798f85a258f212520d77789eb52162882f8fe
tree756cfdf7ad642216fcd2af056979748d7e9c938e
parentf6946c0ab6b923da6a758550df2c0c222c383dc9
parentac436cfb2cdd20c31fdf5b417357495592066452
Merge branch 'erp5-component' into erp5