Merge branch 'MDL-41151-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Sep 2013 02:22:02 +0000 (10:22 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Sep 2013 02:22:02 +0000 (10:22 +0800)

Trivial merge