Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Oct 2013 08:59:29 +0000 (10:59 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Oct 2013 08:59:29 +0000 (10:59 +0200)
commit25e015c28377bd52517fb71e1d1f618d0a817128
tree191f3c1b754d2de9cfd9efd878731e521db0ac97
parentbb55ce61c296b0b197951a7560dda59fd155753c
parent9e340a01285f8f400cb176d71e52ec06c781b41f
Merge remote-tracking branch 'origin/master' into erp5-component