Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde
authorChuck Hagenbuch <chuck@horde.org>
Mon, 30 Mar 2009 03:05:03 +0000 (23:05 -0400)
committerChuck Hagenbuch <chuck@horde.org>
Mon, 30 Mar 2009 03:05:03 +0000 (23:05 -0400)
commit2336885292f47d1f1681fa1aece7119effc5f6a0
tree48498f753858d8f8cc998bc95ef9750d2e2c4e94
parent33ba0989f0adb517a496319e59ee5a0b9babeb95
parentd8e09f1f1699ce93035f13a474e3c6f8535af91f
Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde