diff options
author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-19 11:26:45 +0200 |
---|---|---|
committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-19 11:26:45 +0200 |
commit | 8f73bddc9adc7c01023204af56f13bdb25a4b8c4 (patch) | |
tree | 6d937bc05454572322130965158862fa568a4c55 /.bzrignore | |
parent | 248625d910dda9848c99f28c5c73c4e4a9bfc4ae (diff) | |
parent | 87b91752f9951aae73d03b27088d8aca0b6b2b30 (diff) | |
download | mariadb-git-8f73bddc9adc7c01023204af56f13bdb25a4b8c4.tar.gz |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to '.bzrignore')
0 files changed, 0 insertions, 0 deletions