Merge branch 'MDL-25631_m23' of git://github.com/merrill-oakland/moodle into MOODLE_2...
authorDamyon Wiese <damyon@moodle.com>
Thu, 28 Mar 2013 02:42:18 +0000 (10:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 28 Mar 2013 02:42:18 +0000 (10:42 +0800)

Trivial merge