Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 5 May 2014 11:13:06 +0000 (13:13 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 5 May 2014 11:13:06 +0000 (13:13 +0200)
commit30f9ba01c7506c6bbbb249e0e19b2e303279279d
tree5afc3344c22f5588dcdf9042afa219c68c4e5aef
parent85fc89e3f4a6414bc5892011253068fafbbdbc93
parent328800d5363fb3a7e5c39f17f99d52abc38f7dc6
Merge remote-tracking branch 'origin/master' into erp5-component