Merge branch 'master' into webdav
authorAntoine Catton <acatton@tiolive.com>
Tue, 20 Sep 2011 12:28:39 +0000 (14:28 +0200)
committerAntoine Catton <acatton@tiolive.com>
Tue, 20 Sep 2011 12:28:39 +0000 (14:28 +0200)
commit87e3232862ee1c3e2fa34b05eda25852282a007d
tree2e434b6fcdc4984ee9cd9114d458013dd34a17d6
parent576e95e058209a1a4e3ce009ac5fb326bb23fd1f
parent7cc1f011b9c34334bf3762fe9a0de077050c31bd
Merge branch 'master' into webdav

Conflicts:
slapos/recipe/davstorage/__init__.py
software/davstorage/software.cfg