summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2012-11-01 17:33:55 +0100
committerTor Didriksen <tor.didriksen@oracle.com>2012-11-01 17:33:55 +0100
commit0b034dd21fd20935eb15f93c3a4f0c94f1b7116b (patch)
tree23bdaa83c6796362ff9b620e61f306fe3f644c2d /VERSION
parent48cbd14165a2d3d4d5c33fd7a4c9ad198dee5dd3 (diff)
parente5d2a53b783d9a0b5240b21d21883b66f036009b (diff)
downloadmariadb-git-0b034dd21fd20935eb15f93c3a4f0c94f1b7116b.tar.gz
merge 5.1 => 5.5
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions