Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 16 Jun 2014 19:05:26 +0000 (21:05 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 16 Jun 2014 19:05:26 +0000 (21:05 +0200)
commit694f3319c775f9671d4af0153e157440d45fae78
treedbdddb513ce8282e52fff7cdc5ca1fe6d12e57db
parent2ad8cb709605d4c2ed01679ce199ac6878743e2c
parent2c303cf2df69d93f1c52a794bf2fdbd861c332cc
Merge remote-tracking branch 'origin/master' into erp5-component