Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 20 May 2014 21:34:37 +0000 (23:34 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 20 May 2014 21:34:37 +0000 (23:34 +0200)
commit83ad5f25e7ec8b2309d572e752352b0835ea115b
tree0387ad5fdf0b1ed864c176fdb75d39f8db707432
parent129fc26bc92e72988f05779fd62e5ef94b32bbc6
parentb0800ffc1eaf19dd6401d41d1c0735df258932ff
Merge remote-tracking branch 'origin/master' into erp5testnode