Merge branch 'ff/genericjmx'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 13 Aug 2009 06:14:24 +0000 (08:14 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 13 Aug 2009 06:14:24 +0000 (08:14 +0200)
commitee203ecd5fae28ab12f158e03e18f2b57394897a
tree40fbdd2b072db55274fd32438e35d97358b2ee75
parent396a709634cef7eff49cbbeb9b59ade74e4bd8bc
parentb920755383f35b7504974d12ccfbd9597b9087d7
Merge branch 'ff/genericjmx'