Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 30 Apr 2014 19:59:39 +0000 (21:59 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 30 Apr 2014 19:59:39 +0000 (21:59 +0200)
commitc434c0368b5845126b6eb8191fd85cf227bf3bca
treea221be7a86d8fc7ff690c78bb06c164ad3603bff
parente674a6f9e40b70ff5cdb9d259692873e8ad4972a
parent328800d5363fb3a7e5c39f17f99d52abc38f7dc6
Merge remote-tracking branch 'origin/master' into erp5testnode

Conflicts:
software/erp5testnode/software.cfg
software/erp5testnode/software.cfg