diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:15:17 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:15:17 +0300 |
| commit | 0835775b7c3b074332800ee92112d68b28cec083 (patch) | |
| tree | 100e3180210c7955f068c9e86e650a52c2834abf /extra | |
| parent | 0a5b406fc54a16ac266cd6d38953b19af3feed30 (diff) | |
| parent | b41937105a67e3af37468e060d12b7d8063094e8 (diff) | |
| download | mariadb-git-0835775b7c3b074332800ee92112d68b28cec083.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- support-files/mysql.spec.sh
Diffstat (limited to 'extra')
0 files changed, 0 insertions, 0 deletions