summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2013-11-01 16:52:21 +0100
committerTor Didriksen <tor.didriksen@oracle.com>2013-11-01 16:52:21 +0100
commitb299c74d1e1a26190073fb86fa99106930afe01c (patch)
treeee6764079cc5aa43ec1e940c698a0ced51ce0976 /VERSION
parent62f124491c9539062609515b77179b820750fca7 (diff)
parenta990d5c715a9edc59f886ac6e890222331a58719 (diff)
downloadmariadb-git-b299c74d1e1a26190073fb86fa99106930afe01c.tar.gz
merge 5.1 => 5.5
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions