Merge branch 'v4-stable' into v5-stable
authorRainer Gerhards <rgerhards@adiscon.com>
Fri, 3 Feb 2012 14:35:28 +0000 (15:35 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Fri, 3 Feb 2012 14:35:28 +0000 (15:35 +0100)
commit1b5fc33198de4f10dbbfadae5d31dcb90f383553
tree44963cfe386415b448b898c0b338a7dc42735c49
parent7335ef41756672a4c17f016f339eff8b132b2910
parentc539324298aa2a3e5febd109f198f1032d2ba3a0
Merge branch 'v4-stable' into v5-stable
plugins/ommysql/ommysql.c