Merge branch 'MDL-34654-master' of git://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 4 Nov 2013 07:22:43 +0000 (15:22 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 4 Nov 2013 07:22:43 +0000 (15:22 +0800)
commitf6015bbf0203f68a423784f13bc822889dc7343d
tree56d7978a808716f66aedf50a7fbaa56de0e65385
parentb763a03ddbde5bda52a7021385b76a2b2ed839cf
parent96c3f75a4dd73dda18cc1c8deedf7604870e955e
Merge branch 'MDL-34654-master' of git://github.com/sammarshallou/moodle