Merge branch 'MDL-38693-master' of git://github.com/jethac/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 23 Jun 2014 06:11:30 +0000 (14:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 23 Jun 2014 06:11:30 +0000 (14:11 +0800)
commit0faba5386c75b329db554c882b28b6968b52150a
tree61706a3ae8dffc6b4e6ba23b23ecef15b15ea78f
parent7fb32aaafc74a3beba3570e3e9d817c22687a943
parent717158700f5c068d3036c63ec49b8b693e7630f6
Merge branch 'MDL-38693-master' of git://github.com/jethac/moodle