Merge branch 'MDL-36949-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 05:28:12 +0000 (13:28 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 05:28:12 +0000 (13:28 +0800)

Trivial merge