merge

75f7e032 · Georgi Kodinov · d62bfebc · 645ded9d · 75f7e032
Commit 75f7e032 authored Aug 10, 2010 by Georgi Kodinov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

README README +2 -2

No files found.
--- a/README
+++ b/README
-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