Merge branch 'MDL-32930' of git://github.com/tmuras/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 12:57:14 +0000 (20:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 12:57:14 +0000 (20:57 +0800)

Trivial merge