Merge branch 'horde-prefs-file'
authorGunnar Wrobel <p@rdus.de>
Mon, 29 Nov 2010 15:50:46 +0000 (16:50 +0100)
committerGunnar Wrobel <p@rdus.de>
Mon, 29 Nov 2010 15:50:46 +0000 (16:50 +0100)

Trivial merge