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)
commit678637f0828b1b90f4201175e50d613a5b030629
tree2eba96a2fd13655d7beffdea0db25f2e80bc6028
parentf6023fb0126d009742bb1c4cefe52bdec56760e3
parent527ff3537e50bdd3c19c1f715e18221e357f230f
Merge branch 'horde-prefs-file'