Merge branch 'MDL-38289-master-int' of git://github.com/FMCorz/moodle
commit8cfc9d75ed309bff02440cca2edbba8a262fb11b
authorDamyon Wiese <damyon@moodle.com>
Thu, 9 May 2013 02:22:16 +0000 (9 10:22 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 9 May 2013 02:22:16 +0000 (9 10:22 +0800)
tree3ebed45b55a722b7f2d74014656734e21ad5a313
parent669dee58048b18d9034a7b2367b97a50b498b0e0
parentb31bd82d60d130534e8924d05c86ad8996124e0b
Merge branch 'MDL-38289-master-int' of git://github.com/FMCorz/moodle