summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael.ronstrom@oracle.com>2011-04-20 15:15:47 +0200
committerMikael Ronstrom <mikael.ronstrom@oracle.com>2011-04-20 15:15:47 +0200
commitf24588519c6549313a87e2fe3aa72d23c1616d68 (patch)
treed2f0f4cd22085914480ada8ca622319b6555e8a6 /packaging
parentd31a06b6c98c670d89ff4d709ccf7a4cf5c34824 (diff)
downloadmariadb-git-f24588519c6549313a87e2fe3aa72d23c1616d68.tar.gz
Fixed error in merge
Diffstat (limited to 'packaging')
0 files changed, 0 insertions, 0 deletions