Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 6 Mar 2014 12:18:51 +0000 (13:18 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 6 Mar 2014 12:18:51 +0000 (13:18 +0100)
commit14adec734eb037062844db44b0568c112aa6e91b
treedc01704f8dbcbb8b540f1f02343d87ef12db42f0
parentfdb49cdecd94b8b2482a52110d1767fcdf40801d
parentde4c042c31dbf009e235551691544031dfccf65e
Merge remote-tracking branch 'origin/master' into erp5-component
software/backupserver/software.cfg