Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery
authorChuck Hagenbuch <chuck@horde.org>
Sat, 21 Nov 2009 01:04:19 +0000 (20:04 -0500)
committerChuck Hagenbuch <chuck@horde.org>
Sat, 21 Nov 2009 01:04:19 +0000 (20:04 -0500)
commitf48f7971d58e420e7f752d1e9d04f9d506224d61
tree75db71b0b4a308f2e3b1de828ba52cefc0ba6dce
parent472bfa9d427d51127df0ccdc14e10e6a2fc3e235
parent170caab54318d14c1472eff7f09f96d928b41845
Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery