Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 5 May 2014 19:15:25 +0000 (21:15 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 5 May 2014 19:15:25 +0000 (21:15 +0200)
commitf391c4c16da80ff6d006f07eba25f50d79bbd767
treebc4a6764f50b56b5fb46496f03a6a530e03db82d
parentc434c0368b5845126b6eb8191fd85cf227bf3bca
parent906dd9d83ee9d5e0f5f3c0cde7b5bac81ae967f5
Merge remote-tracking branch 'origin/master' into erp5testnode
software/erp5testnode/software.cfg