Merge branch 'master' of dev.horde.org:/horde/git/horde-hatchery
authorMichael M Slusarz <slusarz@curecanti.org>
Mon, 10 Nov 2008 17:58:31 +0000 (10:58 -0700)
committerMichael M Slusarz <slusarz@curecanti.org>
Mon, 10 Nov 2008 17:58:31 +0000 (10:58 -0700)
commit5dfaa58822599af0b6699c38abef5c236803c6ba
tree1c80e4975cb41ca6b4812376ecca3203eb4eb4a2
parentf7847aa86a81d9c6055f16377ebc20f596dcb7bb
parent22e27dc6d66bf15f51328988be712962ac6a2776
Merge branch 'master' of dev.horde.org:/horde/git/horde-hatchery