Git merges in Moodle 1.9.x by Dan Poltawski

commit e1d726afcf9263cfa4ed18c6b338a86bf8ec9445
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 25 May 2012 16:38:31 +0800
Tag:    v1.9.19

Merge branch 'w21_MDL-28676_m19_mysqli' of git://github.com/skodak/moodle into MOODLE_19_STABLE


commit a9375cc95d5bc70a49d782bd8c070be33bd42d5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 07 May 2012 15:32:53 +0800
Tag:    v1.9.18

Merge branch 'MDL-18335b_m19' of git://github.com/rwijaya/moodle into MOODLE_19_STABLE