Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Apr 2014 12:23:22 +0000 (14:23 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Apr 2014 12:23:22 +0000 (14:23 +0200)
commita26f223fdca24a4030b239faf251f2039dfab11e
treee8b84a59cddadf0c259cfc3a3a401efd6650d00d
parent717efa34c137001021080a685a7b691de76d7e4f
parentbd9b73140faf237ec482344845658d003201279e
Merge remote-tracking branch 'origin/master' into erp5testnode