Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery
authorChuck Hagenbuch <chuck@horde.org>
Wed, 18 Nov 2009 18:00:37 +0000 (13:00 -0500)
committerChuck Hagenbuch <chuck@horde.org>
Wed, 18 Nov 2009 18:00:37 +0000 (13:00 -0500)
commit978400dcfd089336bceabcdb8b03937fb29c9994
tree754f48f288383e9e28ab1d2914f7ff46c76b5224
parentfeea843ea7c149c49f1c4231cc10d6b9cf88d4c0
parent4d2e19922648cfc74ca479cef2c71b6e1d6a48c7
Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery