Merge branch 'MDL-25631' of git://github.com/merrill-oakland/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 28 Mar 2013 01:39:05 +0000 (09:39 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 28 Mar 2013 01:39:05 +0000 (09:39 +0800)

Trivial merge