Merge branch 'setter-injection'
authorChuck Hagenbuch <chuck@horde.org>
Mon, 26 Apr 2010 00:27:51 +0000 (20:27 -0400)
committerChuck Hagenbuch <chuck@horde.org>
Mon, 26 Apr 2010 00:27:51 +0000 (20:27 -0400)
commitf5b49b8427950e621f866a52bffbb77d8d80b89c
tree6ee6e254e2278e61f654ed3e30d44f0dddd9b65a
parentfc1e820200efb6807df0562b8463142156ce5eda
parentb89acd6e7bc2c2ab7510c24f5706638dcd816af4
Merge branch 'setter-injection'