Merge Andrew - fix bug #701124: wrong intl text domain Merge Andrew - fix bug #701137: drizzled --help not translated Merge Shrews - fix bug 701056: filtered_replicator not filtering all events Merge Monty - Changed the plugin_registry to store a pair of plugin_type/plugin_name instead of just plugin_name