Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 19 May 2014 12:17:37 +0000 (14:17 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 19 May 2014 12:17:37 +0000 (14:17 +0200)
commitd8a5f06cb83f8942c103323e6e6478254c4f5bd6
tree7b00770e2f6cd0bea576db5e3c35c8b37cdb074c
parent3f377b243e0089b57f1b67bba30e12e3abe28578
parentab499ffc42e46355aedcd7fec42acb9ae8606759
Merge remote-tracking branch 'origin/master' into erp5-component
software/slaprunner/software.cfg