Merge branch 'modular' into multiple-inheritance
commitf9abf16ec196cc3bfc447f72e39d4b7c1c3fa045
authorMauro Iazzi <mauro.iazzi@gmail.com>
Thu, 17 Jul 2008 09:27:38 +0000 (17 11:27 +0200)
committerMauro Iazzi <mauro.iazzi@gmail.com>
Thu, 17 Jul 2008 09:27:38 +0000 (17 11:27 +0200)
tree9c18472ba4dde507352febb2116a5d9057954e10
parent315c4104c28bb8b8cc473bc2e79b73002126c127
parent81c264e48aa89da8b5b374387037627bb570ec0b
Merge branch 'modular' into multiple-inheritance