Merge branch 'MDL-41259_master' of https://github.com/nitzo/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Sep 2013 07:02:12 +0000 (15:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Sep 2013 07:02:12 +0000 (15:02 +0800)
commitc932a4db7c9b87dabda628376a1c0ac82873e8fc
tree032c148b17e328fa81a32592e13a08921287a9cb
parentfb692af13b2b24b2cdbc080548adb1abf84d0519
parentfdb04f62e994a4b4a0450bab43412c610d828abf
Merge branch 'MDL-41259_master' of https://github.com/nitzo/moodle