Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery
authorChuck Hagenbuch <chuck@horde.org>
Thu, 19 Nov 2009 14:44:59 +0000 (09:44 -0500)
committerChuck Hagenbuch <chuck@horde.org>
Thu, 19 Nov 2009 14:44:59 +0000 (09:44 -0500)
commit99afa944bb0bb7f6bbf5c8476ca908db74a4d19d
tree4ec96530555b37d63a969c86f614b9e1d31c52d3
parent978400dcfd089336bceabcdb8b03937fb29c9994
parentd650522222f8d2c5760edca6a524b5ba89cf31ba
Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery