Merge authors: Kristian Nielsen (knielsen) ------------------------------------------------------------ revno: 2782 [merge] committer: knielsen@knielsen-hq.org branch nick: work-5.1-mtr2 timestamp: Mon 2009-12-07 07:53:36 +0100 message: Automatic merge modified: BUILD/FINISH.sh BUILD/SETUP.sh extra/yassl/taocrypt/include/block.hpp mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl plugin/fulltext/plugin_example.c vio/viosslfactories.c -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.