Merge branch 'MDL-29258_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 25 Apr 2013 09:32:28 +0000 (10:32 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 25 Apr 2013 09:32:28 +0000 (10:32 +0100)

Trivial merge