summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg.bruehe@oracle.com>2011-12-16 12:54:28 +0100
committerJoerg Bruehe <joerg.bruehe@oracle.com>2011-12-16 12:54:28 +0100
commita7b9764368c66d571d2c74dda66b06dee6d3032c (patch)
tree5bf3e688f5daac0ac1c18465a5e6e00da2b23970
parent559f2ccebe4a923528d031608cf72f5738e6dd54 (diff)
parent11ef05e9221e677d522baf987fde231011c9e63a (diff)
downloadmariadb-git-a7b9764368c66d571d2c74dda66b06dee6d3032c.tar.gz
Empty merge (alignment of version number changesets).
0 files changed, 0 insertions, 0 deletions