Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery
authorChuck Hagenbuch <chuck@horde.org>
Fri, 20 Nov 2009 14:58:58 +0000 (09:58 -0500)
committerChuck Hagenbuch <chuck@horde.org>
Fri, 20 Nov 2009 14:58:58 +0000 (09:58 -0500)
commit472bfa9d427d51127df0ccdc14e10e6a2fc3e235
treee63c094d474301677ee1bc7db6e63aef702090c3
parent99afa944bb0bb7f6bbf5c8476ca908db74a4d19d
parent84d455e1503a16ea4d2a80a674930da21081ad73
Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery