Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 06:55:18 +0000 (14:55 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 06:55:18 +0000 (14:55 +0800)
commit7f2c374dcddda0163366d4649d6b568c7fba2622
tree47ef31396784405a4ef0a7be02e5412abdbb4d09
parentb6813d8f6aff2f24782c1679899c561dfa234576
parent597ac7e5d2a097f883c4be4c61ede8e15c789032
Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle