Merge branch 'master' of dev.horde.org:/horde/git/horde
authorMichael M Slusarz <slusarz@curecanti.org>
Mon, 10 Nov 2008 03:28:38 +0000 (20:28 -0700)
committerMichael M Slusarz <slusarz@curecanti.org>
Mon, 10 Nov 2008 03:28:38 +0000 (20:28 -0700)
commit8a28c9082fced29b8971c8464e2b591245cd449e
treeef7590e1a77d8e49d0404ab8ad0fb3cc8d67b0be
parentc0941ce4b7e96c2e90d7a817a4f14c6fdb26b6a0
parentdbc9c537f55dc8b7dd616fb2424c7253f04057dc
Merge branch 'master' of dev.horde.org:/horde/git/horde