Merge branch 'MDL-38455-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 06:53:28 +0000 (14:53 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 06:53:28 +0000 (14:53 +0800)

Trivial merge