summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-08-10 16:39:57 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-08-10 16:39:57 +0300
commit75f7e032c4f3c631cce1e45d2703410a7cf3c54e (patch)
tree01dcf3d778acd5e6440d17009e2e6f70345a0f8f /README
parentd62bfebc7ede98df28ac75ec0d0880fd07f201db (diff)
parent645ded9d4b99a4b4264abc849e48091586290f46 (diff)
downloadmariadb-git-75f7e032c4f3c631cce1e45d2703410a7cf3c54e.tar.gz
merge
Diffstat (limited to 'README')
-rw-r--r--README4
1 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index 8b6ccdfe5cf..ac92d77f8bd 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is a release of MySQL, a dual-license SQL database server.
-MySQL is brought to you by the MySQL team at Sun Microsystems, Inc.
+This is a release of MySQL, a dual-license SQL DBMS.
+MySQL is brought to you by the MySQL team at Oracle Corporation.
License information can be found in these files:
- For GPL (free) distributions, see the COPYING file and