Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery
authorChuck Hagenbuch <chuck@horde.org>
Sat, 15 Nov 2008 17:24:38 +0000 (12:24 -0500)
committerChuck Hagenbuch <chuck@horde.org>
Sat, 15 Nov 2008 17:24:38 +0000 (12:24 -0500)
commit46a4ceaace402c1b0605849384f9b2b789760ffe
tree29be27837b8b229218489fda19f68bd1cf107cef
parent2d1a0ba1a57cf4c2e42b81ad51f9ba380b3264e6
parent7de276204b5859d9ce8a62dfaee8a5cbe30f069c
Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery