summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2009-10-23 22:26:26 +0300
committerMichael Widenius <monty@askmonty.org>2009-10-23 22:26:26 +0300
commitb9ea90b0640317295cbd50c826d319e26c73480f (patch)
treebdefff10d2b087b911f764afbcc5667d99f713d0 /README
parentb9f5aba8e44f8790366b51f98eec819f10ef65ab (diff)
parentafd0a45639279c8de44f1358cc83c1f1b76ebb30 (diff)
downloadmariadb-git-b9ea90b0640317295cbd50c826d319e26c73480f.tar.gz
Automatic merge
Diffstat (limited to 'README')
-rw-r--r--README1
1 files changed, 0 insertions, 1 deletions
diff --git a/README b/README
index fb6d8a8abcf..7ad036784dd 100644
--- a/README
+++ b/README
@@ -1,5 +1,4 @@
This is a release of MariaDB, a branch of MySQL.
-MySQL is brought to you by the MySQL team at Sun Microsystems, Inc.
MariaDB is a drop-in replacement of MySQL, with more features, less
bugs and better performance.